Updated Logo :')

LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ 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.
+
+    MagicCounter is a FOSS Magic the Gathering Health Tracker.
+    Copyright (C) 2025 Atridad Lahiji
+
+    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 <https://www.gnu.org/licenses/>.
+
+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:
+
+    MagicCounter  Copyright (C) 2025  Atridad Lahiji
+    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
+<https://www.gnu.org/licenses/>.
+
+  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
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

android/.idea/.name

@@ -0,0 +1 @@
+MagicCounter

android/.idea/misc.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">

android/.idea/vcs.xml

@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
   </component>
 </project>

android/app/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
@@ -13,8 +15,8 @@ android {
         applicationId = "com.atridad.magiccounter"
         minSdk = 31
         targetSdk = 36
-        versionCode = 2
+        versionCode = 5
-        versionName = "1.2.0"
+        versionName = "1.4.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -34,9 +36,7 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
+    kotlin { compilerOptions { jvmTarget.set(JvmTarget.JVM_17) } }
-        jvmTarget = "17"
-    }
 
     java {
         toolchain {

android/app/src/main/java/com/atridad/magiccounter/ui/MagicCounterApp.kt

@@ -65,7 +65,7 @@ fun MagicCounterApp() {
     val settingsVm: AppSettingsViewModel = viewModel()
     val theme = settingsVm.themeMode.collectAsState()
     val historyState = settingsVm.matchHistory.collectAsState()
-    
+
 
 
     MagicCounterTheme(themeMode = theme.value) {
@@ -81,7 +81,7 @@ fun MagicCounterApp() {
                     }
                 },
                 actions = {
-                    
+
                     IconButton(onClick = { screenStack.add(Screen.Settings) }) {
                         Icon(Icons.Default.Settings, contentDescription = "App settings")
                     }
@@ -142,7 +142,7 @@ fun MagicCounterApp() {
                         screenStack.removeAt(screenStack.lastIndex)
                         return@SetupScreen
                     }
-                    
+
                     // Create and persist a new MatchRecord
                     val newId = java.util.UUID.randomUUID().toString()
                     val now = System.currentTimeMillis()
@@ -175,6 +175,8 @@ fun MagicCounterApp() {
                             .padding(paddingValues)
                             .fillMaxSize(),
                         state = stateForGame,
+                        matchName = record?.name ?: "Game",
+                        startedAtEpochMs = record?.startedAtEpochMs ?: System.currentTimeMillis(),
                         onProgress = { updated ->
                             val current = historyState.value
                             val idx = current.indexOfFirst { it.id == id }
@@ -233,7 +235,7 @@ fun MagicCounterApp() {
                 onSelect = { settingsVm.setTheme(it) }
             )
         }
-        
+
 
     }
     }
@@ -242,7 +244,7 @@ fun MagicCounterApp() {
 @Composable
 private fun SettingsContent(modifier: Modifier, current: ThemeMode, onSelect: (ThemeMode) -> Unit) {
     Column(
-        modifier = modifier.padding(24.dp), 
+        modifier = modifier.padding(24.dp),
         verticalArrangement = Arrangement.spacedBy(24.dp)
     ) {
         Text(
@@ -250,7 +252,7 @@ private fun SettingsContent(modifier: Modifier, current: ThemeMode, onSelect: (T
             style = MaterialTheme.typography.headlineSmall,
             color = MaterialTheme.colorScheme.primary
         )
-        
+
         Column(verticalArrangement = Arrangement.spacedBy(16.dp)) {
             Text(
                 "Theme",
@@ -291,17 +293,17 @@ private fun HomeScreen(
             contentAlignment = Alignment.Center
         ) {
             Column(
-                horizontalAlignment = Alignment.CenterHorizontally, 
+                horizontalAlignment = Alignment.CenterHorizontally,
                 verticalArrangement = Arrangement.spacedBy(16.dp)
             ) {
                 Icon(
-                    Icons.Default.History, 
+                    Icons.Default.History,
                     contentDescription = "Empty history",
                     modifier = Modifier.size(64.dp),
                     tint = MaterialTheme.colorScheme.onSurfaceVariant
                 )
                 Text(
-                    "No games yet", 
+                    "No games yet",
                     style = MaterialTheme.typography.headlineSmall,
                     color = MaterialTheme.colorScheme.onSurfaceVariant
                 )
@@ -332,13 +334,13 @@ private fun HomeScreen(
                         onClick = { onResume(activeGame) }
                     ) {
                         Row(
-                            modifier = Modifier.fillMaxWidth().padding(16.dp), 
+                            modifier = Modifier.fillMaxWidth().padding(16.dp),
                             horizontalArrangement = Arrangement.SpaceBetween,
                             verticalAlignment = Alignment.CenterVertically
                         ) {
                             Column(modifier = Modifier.weight(1f)) {
                                 Text(
-                                    "Active Game", 
+                                    "Active Game",
                                     style = MaterialTheme.typography.titleMedium,
                                     color = MaterialTheme.colorScheme.onPrimary
                                 )
@@ -382,23 +384,29 @@ private fun HomeScreen(
                     onClick = { onResume(rec) }
                 ) {
                     Row(
-                        modifier = Modifier.fillMaxWidth().padding(16.dp), 
+                        modifier = Modifier.fillMaxWidth().padding(16.dp),
                         horizontalArrangement = Arrangement.SpaceBetween,
                         verticalAlignment = Alignment.CenterVertically
                     ) {
                         Column(modifier = Modifier.weight(1f)) {
                             Text(
-                                rec.name, 
+                                rec.name,
                                 style = MaterialTheme.typography.bodyLarge,
                                 color = MaterialTheme.colorScheme.onSurfaceVariant
                             )
-                            val status = if (rec.state.stopped) "Stopped" else "Finished"
+                            val winnerId = rec.winnerPlayerId ?: rec.state.winnerPlayerId
-                            val winner = rec.winnerPlayerId?.let { " • Winner: Player ${it + 1}" } ?: ""
+                            val winnerName = winnerId?.let { wId ->
-                            val statusText = if (winner.isNotEmpty()) "$status$winner" else status
+                                rec.state.players.find { it.id == wId }?.name
+                            }
+                            val statusText = when {
+                                winnerName != null -> "Winner: $winnerName"
+                                rec.state.stopped -> "Stopped"
+                                else -> "Finished"
+                            }
                             Text(
                                 statusText,
                                 style = MaterialTheme.typography.bodyMedium,
-                                color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f)
+                                color = if (winnerName != null) Color(0xFF2E7D32) else MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f)
                             )
                         }
                         Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
@@ -409,12 +417,12 @@ private fun HomeScreen(
                                     containerColor = MaterialTheme.colorScheme.secondary,
                                     contentColor = MaterialTheme.colorScheme.onSecondary
                                 )
-                            ) { 
+                            ) {
                                 Icon(
-                                    Icons.Default.Visibility, 
+                                    Icons.Default.Visibility,
                                     contentDescription = "View match",
                                     modifier = Modifier.size(20.dp)
-                                ) 
+                                )
                             }
                             androidx.compose.material3.FilledTonalIconButton(
                                 onClick = { pendingDeleteId = rec.id },
@@ -423,12 +431,12 @@ private fun HomeScreen(
                                     containerColor = MaterialTheme.colorScheme.error,
                                     contentColor = MaterialTheme.colorScheme.onError
                                 )
-                            ) { 
+                            ) {
                                 Icon(
-                                    Icons.Default.Delete, 
+                                    Icons.Default.Delete,
                                     contentDescription = "Delete",
                                     modifier = Modifier.size(20.dp)
-                                ) 
+                                )
                             }
                         }
                     }
@@ -461,14 +469,14 @@ private fun GameDuration(
     color: Color
 ) {
     var duration by remember { mutableStateOf("") }
-    
+
     LaunchedEffect(startTime) {
         while (true) {
             val elapsed = System.currentTimeMillis() - startTime
             val seconds = (elapsed / 1000).toInt()
             val minutes = seconds / 60
             val remainingSeconds = seconds % 60
-            
+
             duration = when {
                 minutes > 0 -> "Duration: ${minutes}m ${remainingSeconds}s"
                 else -> "${remainingSeconds}s"
@@ -476,12 +484,10 @@ private fun GameDuration(
             delay(1000)
         }
     }
-    
+
     Text(
         text = duration,
         style = MaterialTheme.typography.bodyMedium,
         color = color.copy(alpha = 0.8f)
     )
 }
-
-

android/app/src/main/java/com/atridad/magiccounter/ui/state/GameState.kt

@@ -21,9 +21,8 @@ data class GameState(
     val startingLife: Int,
     val trackPoison: Boolean,
     val trackCommanderDamage: Boolean,
-    val stopped: Boolean = false
+    val stopped: Boolean = false,
+    val winnerPlayerId: Int? = null
 )
 
 fun defaultPlayerName(index: Int): String = "Player ${index + 1}"
-
-

android/app/src/main/java/com/atridad/magiccounter/ui/theme/CustomIcons.kt

@@ -201,6 +201,25 @@ object CustomIcons {
         close()
     }.build()
 
+    fun Droplet(color: Color = Color.Black): ImageVector = ImageVector.Builder(
+        name = "Droplet",
+        defaultWidth = 24.dp,
+        defaultHeight = 24.dp,
+        viewportWidth = 24f,
+        viewportHeight = 24f
+    ).path(
+        fill = SolidColor(color)
+    ) {
+        moveTo(12f, 2.69f)
+        lineTo(17.66f, 8.35f)
+        curveTo(19.1f, 9.79f, 20f, 11.79f, 20f, 14f)
+        curveTo(20f, 18.42f, 16.42f, 22f, 12f, 22f)
+        curveTo(7.58f, 22f, 4f, 18.42f, 4f, 14f)
+        curveTo(4f, 11.79f, 4.9f, 9.79f, 6.34f, 8.35f)
+        lineTo(12f, 2.69f)
+        close()
+    }.build()
+
     fun Sword(color: Color = Color.Black): ImageVector = ImageVector.Builder(
         name = "Sword",
         defaultWidth = 24.dp,

android/app/src/main/res/drawable/ic_launcher_background.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    android:height="108dp"
+    android:width="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#3DDC84"
+          android:pathData="M0,0h108v108h-108z"/>
+    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+</vector>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@android:color/transparent" />
+    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@android:color/transparent" />
+    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>

android/app/src/main/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#000000</color>
+</resources>

android/gradle/libs.versions.toml

@@ -1,23 +1,23 @@
 [versions]
-agp = "8.12.1"
+agp = "8.12.3"
-kotlin = "2.0.21"
+kotlin = "2.3.0"
-coreKtx = "1.10.1"
+coreKtx = "1.17.0"
 junit = "4.13.2"
-junitVersion = "1.1.5"
+junitVersion = "1.3.0"
-espressoCore = "3.5.1"
+espressoCore = "3.7.0"
-appcompat = "1.6.1"
+appcompat = "1.7.1"
-material = "1.10.0"
+material = "1.13.0"
-constraintlayout = "2.1.4"
+constraintlayout = "2.2.1"
-lifecycleLivedataKtx = "2.6.1"
+lifecycleLivedataKtx = "2.10.0"
-lifecycleViewmodelKtx = "2.6.1"
+lifecycleViewmodelKtx = "2.10.0"
-navigationFragmentKtx = "2.6.0"
+navigationFragmentKtx = "2.9.6"
-navigationUiKtx = "2.6.0"
+navigationUiKtx = "2.9.6"
-composeBom = "2024.10.01"
+composeBom = "2025.12.01"
-activityCompose = "1.9.2"
+activityCompose = "1.12.2"
-lifecycleRuntimeCompose = "2.8.6"
+lifecycleRuntimeCompose = "2.10.0"
-lifecycleViewmodelCompose = "2.8.6"
+lifecycleViewmodelCompose = "2.10.0"
-datastore = "1.1.1"
+datastore = "1.2.0"
-serialization = "1.7.3"
+serialization = "1.9.0"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }

ios/MagicCounter.xcodeproj/project.pbxproj

@@ -411,22 +411,22 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = 4BC9Y2LL4B;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_CFBundleDisplayName = MagicCounter;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.games";
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
-				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
-				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				IPHONEOS_DEPLOYMENT_TARGET = 17.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.atridad.MagicCounter;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				STRING_CATALOG_GENERATE_SYMBOLS = YES;
@@ -446,22 +446,22 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = 4BC9Y2LL4B;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_CFBundleDisplayName = MagicCounter;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.games";
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
-				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
-				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				IPHONEOS_DEPLOYMENT_TARGET = 17.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.atridad.MagicCounter;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				STRING_CATALOG_GENERATE_SYMBOLS = YES;

ios/MagicCounter/Components.swift

@@ -6,61 +6,180 @@
 //
 
 import SwiftUI
+import Combine
 
 /**
  * A circular button with an icon, used for game controls.
+ * Supports optional long press to trigger a custom delta prompt.
  */
 struct CircleButton: View {
     let icon: String
     let color: Color
     let size: CGFloat
     let action: () -> Void
-    
+    var onLongPress: (() -> Void)? = nil
-    init(icon: String, color: Color, size: CGFloat = 44, action: @escaping () -> Void) {
+
+    init(icon: String, color: Color, size: CGFloat = 44, action: @escaping () -> Void, onLongPress: (() -> Void)? = nil) {
         self.icon = icon
         self.color = color
         self.size = size
         self.action = action
+        self.onLongPress = onLongPress
     }
-    
+
     var body: some View {
-        Button(action: action) {
+        Image(systemName: icon)
-            Image(systemName: icon)
+            .font(size < 40 ? .caption : .title3)
-                .font(size < 40 ? .caption : .title3)
+            .frame(width: size, height: size)
-                .frame(width: size, height: size)
+            .background(color.opacity(0.2))
-                .background(color.opacity(0.2))
+            .clipShape(Circle())
-                .clipShape(Circle())
+            .foregroundStyle(color)
-                .foregroundStyle(color)
+            .contentShape(Circle())
+            .onTapGesture {
+                action()
+            }
+            .onLongPressGesture(minimumDuration: 0.5) {
+                onLongPress?()
+            }
+    }
+}
+
+/**
+ * A view that shows the accumulated delta change near a counter button.
+ * Automatically fades out after a delay.
+ */
+struct DeltaIndicator: View {
+    let delta: Int
+    let alignment: HorizontalAlignment
+
+    var body: some View {
+        if delta != 0 {
+            Text(delta > 0 ? "+\(delta)" : "\(delta)")
+                .font(.system(size: 16, weight: .bold, design: .rounded))
+                .foregroundStyle(delta > 0 ? .green : .red)
+                .opacity(0.8)
+                .transition(.opacity.combined(with: .scale))
         }
     }
 }
 
+/**
+ * Observable class to manage delta accumulation and fade-out timing.
+ */
+class DeltaTracker: ObservableObject {
+    @Published var delta: Int = 0
+    private var resetTimer: Timer?
+
+    func addDelta(_ amount: Int) {
+        delta += amount
+        resetTimer?.invalidate()
+        resetTimer = Timer.scheduledTimer(withTimeInterval: 2.0, repeats: false) { [weak self] _ in
+            withAnimation(.easeOut(duration: 0.3)) {
+                self?.delta = 0
+            }
+        }
+    }
+
+    func reset() {
+        resetTimer?.invalidate()
+        delta = 0
+    }
+}
+
 /**
  * A control for adjusting a large numerical value (like Life).
+ * Shows delta indicators and supports long-press for custom delta input.
  */
 struct LifeCounterControl: View {
     let value: Int
     let onDecrease: () -> Void
     let onIncrease: () -> Void
-    
+    var onCustomDelta: ((Int) -> Void)? = nil
+
+    @StateObject private var deltaTracker = DeltaTracker()
+    @State private var showingCustomDeltaAlert = false
+    @State private var customDeltaText = ""
+    @State private var isIncreasing = true
+
     var body: some View {
         HStack(spacing: 16) {
-            CircleButton(icon: "minus", color: .red, action: onDecrease)
+            ZStack {
-            
+                CircleButton(
+                    icon: "minus",
+                    color: .red,
+                    action: {
+                        onDecrease()
+                        withAnimation(.easeOut(duration: 0.15)) {
+                            deltaTracker.addDelta(-1)
+                        }
+                    },
+                    onLongPress: {
+                        isIncreasing = false
+                        customDeltaText = ""
+                        showingCustomDeltaAlert = true
+                        Haptics.play(.medium)
+                    }
+                )
+
+                if deltaTracker.delta < 0 {
+                    DeltaIndicator(delta: deltaTracker.delta, alignment: .trailing)
+                        .offset(y: -35)
+                }
+            }
+
             Text("\(value)")
                 .font(.system(size: 56, weight: .bold, design: .rounded))
                 .minimumScaleFactor(0.5)
                 .lineLimit(1)
                 .foregroundStyle(.primary)
-            
+
-            CircleButton(icon: "plus", color: .green, action: onIncrease)
+            ZStack {
+                CircleButton(
+                    icon: "plus",
+                    color: .green,
+                    action: {
+                        onIncrease()
+                        withAnimation(.easeOut(duration: 0.15)) {
+                            deltaTracker.addDelta(1)
+                        }
+                    },
+                    onLongPress: {
+                        isIncreasing = true
+                        customDeltaText = ""
+                        showingCustomDeltaAlert = true
+                        Haptics.play(.medium)
+                    }
+                )
+
+                if deltaTracker.delta > 0 {
+                    DeltaIndicator(delta: deltaTracker.delta, alignment: .leading)
+                        .offset(y: -35)
+                }
+            }
         }
         .padding(.horizontal, 16)
+        .alert("Enter Amount", isPresented: $showingCustomDeltaAlert) {
+            TextField("Amount", text: $customDeltaText)
+                .keyboardType(.numberPad)
+            Button("Cancel", role: .cancel) { }
+            Button(isIncreasing ? "Add" : "Subtract") {
+                if let amount = Int(customDeltaText), amount > 0 {
+                    let delta = isIncreasing ? amount : -amount
+                    onCustomDelta?(delta)
+                    withAnimation(.easeOut(duration: 0.15)) {
+                        deltaTracker.addDelta(delta)
+                    }
+                }
+            }
+        } message: {
+            Text(isIncreasing ? "Enter the amount to add" : "Enter the amount to subtract")
+        }
     }
 }
 
 /**
  * A smaller control for adjusting secondary values (like Poison).
+ * Shows delta indicators and supports long-press for custom delta input.
  */
 struct SmallCounterControl: View {
     let value: Int
@@ -68,11 +187,41 @@ struct SmallCounterControl: View {
     let color: Color
     let onDecrease: () -> Void
     let onIncrease: () -> Void
-    
+    var onCustomDelta: ((Int) -> Void)? = nil
+
+    @StateObject private var deltaTracker = DeltaTracker()
+    @State private var showingCustomDeltaAlert = false
+    @State private var customDeltaText = ""
+    @State private var isIncreasing = true
+
     var body: some View {
         HStack(spacing: 4) {
-            CircleButton(icon: "minus", color: .gray, size: 24, action: onDecrease)
+            ZStack {
-            
+                CircleButton(
+                    icon: "minus",
+                    color: .gray,
+                    size: 24,
+                    action: {
+                        onDecrease()
+                        withAnimation(.easeOut(duration: 0.15)) {
+                            deltaTracker.addDelta(-1)
+                        }
+                    },
+                    onLongPress: {
+                        isIncreasing = false
+                        customDeltaText = ""
+                        showingCustomDeltaAlert = true
+                        Haptics.play(.medium)
+                    }
+                )
+
+                if deltaTracker.delta < 0 {
+                    DeltaIndicator(delta: deltaTracker.delta, alignment: .trailing)
+                        .font(.system(size: 12, weight: .bold))
+                        .offset(y: -22)
+                }
+            }
+
             VStack(spacing: 0) {
                 Image(systemName: icon)
                     .font(.caption2)
@@ -82,12 +231,52 @@ struct SmallCounterControl: View {
                     .foregroundStyle(color)
             }
             .frame(minWidth: 30)
-            
+
-            CircleButton(icon: "plus", color: .gray, size: 24, action: onIncrease)
+            ZStack {
+                CircleButton(
+                    icon: "plus",
+                    color: .gray,
+                    size: 24,
+                    action: {
+                        onIncrease()
+                        withAnimation(.easeOut(duration: 0.15)) {
+                            deltaTracker.addDelta(1)
+                        }
+                    },
+                    onLongPress: {
+                        isIncreasing = true
+                        customDeltaText = ""
+                        showingCustomDeltaAlert = true
+                        Haptics.play(.medium)
+                    }
+                )
+
+                if deltaTracker.delta > 0 {
+                    DeltaIndicator(delta: deltaTracker.delta, alignment: .leading)
+                        .font(.system(size: 12, weight: .bold))
+                        .offset(y: -22)
+                }
+            }
         }
         .padding(6)
         .background(color.opacity(0.1))
         .cornerRadius(12)
+        .alert("Enter Amount", isPresented: $showingCustomDeltaAlert) {
+            TextField("Amount", text: $customDeltaText)
+                .keyboardType(.numberPad)
+            Button("Cancel", role: .cancel) { }
+            Button(isIncreasing ? "Add" : "Subtract") {
+                if let amount = Int(customDeltaText), amount > 0 {
+                    let delta = isIncreasing ? amount : -amount
+                    onCustomDelta?(delta)
+                    withAnimation(.easeOut(duration: 0.15)) {
+                        deltaTracker.addDelta(delta)
+                    }
+                }
+            }
+        } message: {
+            Text(isIncreasing ? "Enter the amount to add" : "Enter the amount to subtract")
+        }
     }
 }
 
@@ -99,7 +288,7 @@ struct SettingSlider: View {
     let value: Binding<Double>
     let range: ClosedRange<Double>
     let step: Double
-    
+
     var body: some View {
         VStack(alignment: .leading) {
             HStack {
@@ -122,7 +311,7 @@ enum Haptics {
         let generator = UIImpactFeedbackGenerator(style: style)
         generator.impactOccurred()
     }
-    
+
     static func notification(_ type: UINotificationFeedbackGenerator.FeedbackType) {
         guard UserDefaults.standard.bool(forKey: "hapticFeedbackEnabled") else { return }
         let generator = UINotificationFeedbackGenerator()

ios/MagicCounter/GameView.swift

@@ -6,6 +6,8 @@
 //
 
 import SwiftUI
+import UniformTypeIdentifiers
+import Combine
 
 /**
  * Main game screen displaying the grid of players.
@@ -17,75 +19,66 @@ struct GameView: View {
     @State private var gameState: GameState
     @State private var showingStopConfirmation = false
     @State private var selectedPlayerForCommander: PlayerState?
-    
+    @State private var draggedPlayer: PlayerState?
+    @State private var elapsedTime: TimeInterval = 0
+    let match: MatchRecord
+
     init(match: MatchRecord) {
+        self.match = match
         self._gameState = State(initialValue: match.state)
     }
-    
+
     var body: some View {
-        ZStack {
+        NavigationStack {
-            // Background
+            GeometryReader { geometry in
-            LinearGradient(colors: [Color.black, Color.indigo.opacity(0.5)], startPoint: .top, endPoint: .bottom)
+                let columns = [GridItem(.adaptive(minimum: 320), spacing: 24)]
-                .ignoresSafeArea()
+                ScrollView {
-            
+                    VStack(alignment: .leading, spacing: 24) {
-            VStack(spacing: 0) {
+                        // Custom Header
-                // Custom Toolbar
+                        HStack(alignment: .center, spacing: 12) {
-                HStack {
+                            Text(match.name)
-                    Button(action: { gameManager.activeMatch = nil }) {
+                                .font(.largeTitle.bold())
-                        Image(systemName: "xmark")
+                                .lineLimit(1)
-                            .font(.system(size: 16, weight: .bold))
+                                .truncationMode(.tail)
-                            .foregroundColor(.white)
+                                .foregroundStyle(.white)
-                            .padding(10)
+
-                            .background(.ultraThinMaterial)
+                            if !gameState.stopped && gameState.winner == nil {
-                            .clipShape(Circle())
+                                Text(timeString(from: elapsedTime))
-                    }
+                                    .font(.subheadline.bold())
-                    
+                                    .monospacedDigit()
-                    Spacer()
+                                    .foregroundStyle(.green)
-                    
+                                    .padding(.horizontal, 8)
-                    if gameState.stopped {
+                                    .padding(.vertical, 4)
-                        Text("Game Stopped")
+                                    .background(.green.opacity(0.2))
-                            .font(.headline)
+                                    .clipShape(Capsule())
-                            .foregroundStyle(.red)
+                            } else {
-                            .padding(.horizontal, 12)
+                                Text(timeString(from: match.lastUpdated.timeIntervalSince(match.startedAt)))
-                            .padding(.vertical, 6)
+                                    .font(.subheadline.bold())
-                            .background(.ultraThinMaterial)
+                                    .monospacedDigit()
-                            .cornerRadius(8)
+                                    .foregroundStyle(.secondary)
-                    } else if let winner = gameState.winner {
+                                    .padding(.horizontal, 8)
-                        Text("Winner: \(winner.name)")
+                                    .padding(.vertical, 4)
-                            .font(.headline)
+                                    .background(.secondary.opacity(0.2))
-                            .foregroundStyle(.green)
+                                    .clipShape(Capsule())
-                            .padding(.horizontal, 12)
+                            }
-                            .padding(.vertical, 6)
+
-                            .background(.ultraThinMaterial)
+                            Spacer()
-                            .cornerRadius(8)
-                    } else {
-                        Text("Magic Counter")
-                            .font(.headline)
-                            .foregroundStyle(.white)
-                    }
-                    
-                    Spacer()
-                    
-                    if !gameState.stopped && gameState.winner == nil {
-                        Button(action: { showingStopConfirmation = true }) {
-                            Image(systemName: "stop.fill")
-                                .font(.system(size: 16, weight: .bold))
-                                .foregroundColor(.white)
-                                .padding(10)
-                                .background(.ultraThinMaterial)
-                                .clipShape(Circle())
                         }
-                    } else {
+                        .padding(.horizontal, 24)
-                        Color.clear.frame(width: 40, height: 40)
+                        .padding(.top, 16)
-                    }
+
-                }
+                        if gameState.stopped {
-                .padding()
+                            Text("Game Stopped")
-                .background(.ultraThinMaterial)
+                                .font(.headline)
-                
+                                .foregroundStyle(.red)
-                // Players Grid
+                                .padding(.horizontal, 24)
-                GeometryReader { geometry in
+                        } else if let winner = gameState.winner {
-                    let columns = [GridItem(.adaptive(minimum: 320), spacing: 24)]
+                            Text("Winner: \(winner.name)")
-                    ScrollView {
+                                .font(.headline)
+                                .foregroundStyle(.green)
+                                .padding(.horizontal, 24)
+                        }
+
                         LazyVGrid(columns: columns, spacing: 24) {
                             ForEach(gameState.players) { player in
                                 PlayerCell(
@@ -94,15 +87,42 @@ struct GameView: View {
                                     isWinner: gameState.winner?.id == player.id,
                                     onUpdate: updatePlayer,
                                     onCommanderTap: { selectedPlayerForCommander = player },
-                                    onScoop: { scoopPlayer(player) }
+                                    onScoop: { scoopPlayer(player) },
+                                    onDragStart: {
+                                        self.draggedPlayer = player
+                                    }
                                 )
                                 .frame(height: 260)
+                                .onDrop(of: [.text], delegate: PlayerDropDelegate(item: player, items: $gameState.players, draggedItem: $draggedPlayer))
                             }
                         }
-                        .padding(24)
+                        .padding(.horizontal, 24)
+                        .padding(.bottom, 24)
                     }
                 }
             }
+            .navigationBarTitleDisplayMode(.inline)
+            .toolbar {
+                ToolbarItem(placement: .topBarLeading) {
+                    Button(action: { gameManager.activeMatch = nil }) {
+                        Image(systemName: "xmark")
+                    }
+                }
+
+                ToolbarItem(placement: .topBarTrailing) {
+                    if !gameState.stopped && gameState.winner == nil {
+                        Button(action: { showingStopConfirmation = true }) {
+                            Image(systemName: "stop.fill")
+                        }
+                    }
+                }
+            }
+        }
+        .onAppear {
+            updateElapsedTime()
+        }
+        .onReceive(Timer.publish(every: 1, on: .main, in: .common).autoconnect()) { _ in
+            updateElapsedTime()
         }
         .alert("Stop Game?", isPresented: $showingStopConfirmation) {
             Button("Cancel", role: .cancel) { }
@@ -130,23 +150,42 @@ struct GameView: View {
             gameManager.updateActiveGame(state: newState)
         }
     }
-    
+
+    private func updateElapsedTime() {
+        if !gameState.stopped && gameState.winner == nil {
+            elapsedTime = Date().timeIntervalSince(match.startedAt)
+        } else {
+            elapsedTime = match.lastUpdated.timeIntervalSince(match.startedAt)
+        }
+    }
+
+    private func timeString(from timeInterval: TimeInterval) -> String {
+        let hours = Int(timeInterval) / 3600
+        let minutes = Int(timeInterval) / 60 % 60
+        let seconds = Int(timeInterval) % 60
+        if hours > 0 {
+            return String(format: "%02i:%02i:%02i", hours, minutes, seconds)
+        } else {
+            return String(format: "%02i:%02i", minutes, seconds)
+        }
+    }
+
     private func updatePlayer(player: PlayerState) {
         if gameState.stopped || gameState.winner != nil { return }
-        
+
         if let index = gameState.players.firstIndex(where: { $0.id == player.id }) {
             gameState.players[index] = player
         }
-        
+
         // Update the sheet state if this is the player being edited to ensure the view refreshes
         if selectedPlayerForCommander?.id == player.id {
             selectedPlayerForCommander = player
         }
     }
-    
+
     private func scoopPlayer(_ player: PlayerState) {
         if gameState.stopped || gameState.winner != nil { return }
-        
+
         var newPlayer = player
         newPlayer.scooped = true
         updatePlayer(player: newPlayer)
@@ -170,9 +209,10 @@ struct PlayerCell: View {
     let onUpdate: (PlayerState) -> Void
     let onCommanderTap: () -> Void
     let onScoop: () -> Void
-    
+    var onDragStart: (() -> Void)? = nil
+
     @State private var showScoopConfirmation = false
-    
+
     var body: some View {
         ZStack {
             RoundedRectangle(cornerRadius: 24)
@@ -182,35 +222,42 @@ struct PlayerCell: View {
                     RoundedRectangle(cornerRadius: 24)
                         .stroke(isWinner ? Color.green : Color.clear, lineWidth: 3)
                 )
-            
+
             VStack(spacing: 12) {
-                // Header
+                // Header - drag handle area
                 HStack {
                     Text(player.name)
-                        .font(.headline)
+                        .font(.system(size: 22, weight: .semibold, design: .rounded))
                         .lineLimit(1)
-                        .minimumScaleFactor(0.8)
+                        .minimumScaleFactor(0.7)
                         .foregroundStyle(.primary)
+                        .onDrag {
+                            onDragStart?()
+                            return NSItemProvider(object: String(player.id) as NSString)
+                        }
+
                     Spacer()
-                    
+
                     Button(action: { showScoopConfirmation = true }) {
                         Image(systemName: "flag.fill")
+                            .font(.system(size: 18))
                             .foregroundStyle(.secondary)
-                            .padding(4)
+                            .padding(8)
                     }
                 }
                 .padding(.horizontal)
                 .padding(.top, 12)
-                
+
                 // Life
                 LifeCounterControl(
                     value: player.life,
                     onDecrease: { adjustLife(by: -1) },
-                    onIncrease: { adjustLife(by: 1) }
+                    onIncrease: { adjustLife(by: 1) },
+                    onCustomDelta: { adjustLife(by: $0) }
                 )
-                
+
                 Spacer()
-                
+
                 // Counters Row
                 HStack(spacing: 12) {
                     if gameState.trackPoison {
@@ -219,10 +266,11 @@ struct PlayerCell: View {
                             icon: "drop.fill",
                             color: .purple,
                             onDecrease: { adjustPoison(by: -1) },
-                            onIncrease: { adjustPoison(by: 1) }
+                            onIncrease: { adjustPoison(by: 1) },
+                            onCustomDelta: { adjustPoison(by: $0) }
                         )
                     }
-                    
+
                     if gameState.trackCommanderDamage {
                         Button(action: onCommanderTap) {
                             VStack(spacing: 2) {
@@ -240,7 +288,7 @@ struct PlayerCell: View {
                 }
                 .padding(.bottom, 16)
             }
-            
+
             if player.isEliminated && !isWinner {
                 ZStack {
                     Color.black.opacity(0.6)
@@ -264,32 +312,129 @@ struct PlayerCell: View {
             Text("Are you sure you want to scoop?")
         }
     }
-    
+
     private func adjustLife(by amount: Int) {
         if player.isEliminated { return }
         Haptics.play(.light)
         var newPlayer = player
         newPlayer.life += amount
         onUpdate(newPlayer)
-        
+
         if newPlayer.isEliminated && !player.isEliminated {
             Haptics.notification(.error)
         }
     }
-    
+
     private func adjustPoison(by amount: Int) {
         if player.isEliminated { return }
         Haptics.play(.light)
         var newPlayer = player
         newPlayer.poison = max(0, newPlayer.poison + amount)
         onUpdate(newPlayer)
-        
+
         if newPlayer.isEliminated && !player.isEliminated {
             Haptics.notification(.error)
         }
     }
 }
 
+/**
+ * A row for managing commander damage from a single attacker.
+ * Shows delta indicators and supports long-press for custom delta input.
+ */
+struct CommanderDamageRow: View {
+    let attackerName: String
+    let attackerId: Int
+    let currentDamage: Int
+    let onAdjust: (Int) -> Void
+
+    @StateObject private var deltaTracker = DeltaTracker()
+    @State private var showingCustomDeltaAlert = false
+    @State private var customDeltaText = ""
+    @State private var isIncreasing = true
+
+    var body: some View {
+        HStack {
+            Text(attackerName)
+                .font(.headline)
+            Spacer()
+            HStack(spacing: 16) {
+                ZStack {
+                    CircleButton(
+                        icon: "minus",
+                        color: .secondary,
+                        action: {
+                            onAdjust(-1)
+                            withAnimation(.easeOut(duration: 0.15)) {
+                                deltaTracker.addDelta(-1)
+                            }
+                        },
+                        onLongPress: {
+                            isIncreasing = false
+                            customDeltaText = ""
+                            showingCustomDeltaAlert = true
+                            Haptics.play(.medium)
+                        }
+                    )
+                    .buttonStyle(.borderless)
+
+                    if deltaTracker.delta < 0 {
+                        DeltaIndicator(delta: deltaTracker.delta, alignment: .trailing)
+                            .offset(y: -30)
+                    }
+                }
+
+                Text("\(currentDamage)")
+                    .font(.title.bold())
+                    .frame(minWidth: 40)
+                    .multilineTextAlignment(.center)
+
+                ZStack {
+                    CircleButton(
+                        icon: "plus",
+                        color: .primary,
+                        action: {
+                            onAdjust(1)
+                            withAnimation(.easeOut(duration: 0.15)) {
+                                deltaTracker.addDelta(1)
+                            }
+                        },
+                        onLongPress: {
+                            isIncreasing = true
+                            customDeltaText = ""
+                            showingCustomDeltaAlert = true
+                            Haptics.play(.medium)
+                        }
+                    )
+                    .buttonStyle(.borderless)
+
+                    if deltaTracker.delta > 0 {
+                        DeltaIndicator(delta: deltaTracker.delta, alignment: .leading)
+                            .offset(y: -30)
+                    }
+                }
+            }
+        }
+        .padding(.vertical, 8)
+        .alert("Enter Amount", isPresented: $showingCustomDeltaAlert) {
+            TextField("Amount", text: $customDeltaText)
+                .keyboardType(.numberPad)
+            Button("Cancel", role: .cancel) { }
+            Button(isIncreasing ? "Add" : "Subtract") {
+                if let amount = Int(customDeltaText), amount > 0 {
+                    let delta = isIncreasing ? amount : -amount
+                    onAdjust(delta)
+                    withAnimation(.easeOut(duration: 0.15)) {
+                        deltaTracker.addDelta(delta)
+                    }
+                }
+            }
+        } message: {
+            Text(isIncreasing ? "Enter the amount to add" : "Enter the amount to subtract")
+        }
+    }
+}
+
 /**
  * Sheet for managing commander damage received by a player.
  *
@@ -302,35 +447,25 @@ struct CommanderDamageView: View {
     let targetPlayer: PlayerState
     let gameState: GameState
     let onUpdate: (PlayerState) -> Void
-    
+
+    init(targetPlayer: PlayerState, gameState: GameState, onUpdate: @escaping (PlayerState) -> Void) {
+        self.targetPlayer = targetPlayer
+        self.gameState = gameState
+        self.onUpdate = onUpdate
+    }
+
     var body: some View {
         NavigationStack {
             List {
                 ForEach(gameState.players.filter { $0.id != targetPlayer.id }) { attacker in
-                    HStack {
+                    CommanderDamageRow(
-                        Text(attacker.name)
+                        attackerName: attacker.name,
-                            .font(.headline)
+                        attackerId: attacker.id,
-                        Spacer()
+                        currentDamage: targetPlayer.commanderDamages[attacker.id] ?? 0,
-                        HStack(spacing: 16) {
+                        onAdjust: { amount in
-                            CircleButton(
+                            adjustCommanderDamage(attackerId: attacker.id, by: amount)
-                                icon: "minus",
-                                color: .secondary,
-                                action: { adjustCommanderDamage(attackerId: attacker.id, by: -1) }
-                            )
-                            
-                            Text("\(targetPlayer.commanderDamages[attacker.id] ?? 0)")
-                                .font(.title.bold())
-                                .frame(minWidth: 40)
-                                .multilineTextAlignment(.center)
-                            
-                            CircleButton(
-                                icon: "plus",
-                                color: .primary,
-                                action: { adjustCommanderDamage(attackerId: attacker.id, by: 1) }
-                            )
                         }
-                    }
+                    )
-                    .padding(.vertical, 8)
                 }
             }
             .navigationTitle("Commander Damage to \(targetPlayer.name)")
@@ -342,18 +477,59 @@ struct CommanderDamageView: View {
             }
         }
     }
-    
+
     private func adjustCommanderDamage(attackerId: Int, by amount: Int) {
         Haptics.play(.light)
-        var newPlayer = targetPlayer
+        let wasEliminated = targetPlayer.isEliminated
-        var damages = newPlayer.commanderDamages
+
-        let current = damages[attackerId] ?? 0
+        // Get current damage value
-        damages[attackerId] = max(0, current + amount)
+        let current = targetPlayer.commanderDamages[attackerId] ?? 0
-        newPlayer.commanderDamages = damages
+        let newDamage = max(0, current + amount)
-        onUpdate(newPlayer)
+
-        
+        // Only proceed if there's an actual change
-        if newPlayer.isEliminated && !targetPlayer.isEliminated {
+        guard newDamage != current else { return }
+
+        // Update commander damages
+        var updatedPlayer = targetPlayer
+        var damages = updatedPlayer.commanderDamages
+        damages[attackerId] = newDamage
+        updatedPlayer.commanderDamages = damages
+
+        // Adjust life total by the damage change
+        updatedPlayer.life -= amount
+
+        // Notify parent to update
+        onUpdate(updatedPlayer)
+
+        if updatedPlayer.isEliminated && !wasEliminated {
             Haptics.notification(.error)
         }
     }
 }
+
+struct PlayerDropDelegate: DropDelegate {
+    let item: PlayerState
+    @Binding var items: [PlayerState]
+    @Binding var draggedItem: PlayerState?
+
+    func performDrop(info: DropInfo) -> Bool {
+        return true
+    }
+
+    func dropEntered(info: DropInfo) {
+        guard let draggedItem = draggedItem else { return }
+        if draggedItem.id != item.id {
+            if let from = items.firstIndex(where: { $0.id == draggedItem.id }),
+               let to = items.firstIndex(where: { $0.id == item.id }) {
+                withAnimation {
+                    let movedItem = items.remove(at: from)
+                    items.insert(movedItem, at: to)
+                }
+            }
+        }
+    }
+
+    func dropUpdated(info: DropInfo) -> DropProposal? {
+        return DropProposal(operation: .move)
+    }
+}

ios/MagicCounter/Logo.icon/icon.json

@@ -7,15 +7,63 @@
     {
       "layers" : [
         {
-          "image-name" : "logo 2.png",
+          "image-name" : "MagicCounter4.png",
-          "name" : "logo 2",
+          "name" : "MagicCounter4",
           "position" : {
-            "scale" : 0.85,
+            "scale" : 0.2,
+            "translation-in-points" : [
+              -280,
+              280
+            ]
+          }
+        },
+        {
+          "image-name" : "MagicCounter5.png",
+          "name" : "MagicCounter5",
+          "position" : {
+            "scale" : 0.2,
+            "translation-in-points" : [
+              280,
+              280
+            ]
+          }
+        },
+        {
+          "image-name" : "MagicCounter6.png",
+          "name" : "MagicCounter6",
+          "position" : {
+            "scale" : 0.2,
+            "translation-in-points" : [
+              -280,
+              -280
+            ]
+          }
+        },
+        {
+          "image-name" : "MagicCounter3.png",
+          "name" : "MagicCounter3",
+          "position" : {
+            "scale" : 0.2,
             "translation-in-points" : [
               0,
               0
             ]
           }
+        },
+        {
+          "image-name" : "MagicCounter2.png",
+          "name" : "MagicCounter2",
+          "position" : {
+            "scale" : 0.2,
+            "translation-in-points" : [
+              280,
+              -280
+            ]
+          }
+        },
+        {
+          "image-name" : "MagicCounter.png",
+          "name" : "MagicCounter"
         }
       ],
       "shadow" : {