Merge branch 'main' of ssh://git.atri.dad:69/atridad/MagicCounter

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>.

README.md

@@ -1,2 +1,25 @@
 # MagicCounter
 
+This is a FOSS Android and iOS app meant to allow MTG Commander players to keep track of player health and commander damage. This app is offline-only and requires no special permissions to run.
+
+## Download
+
+### Android
+
+You have two options:
+
+1. Download the latest APK from the Released page
+2. [<img src="https://github.com/ImranR98/Obtainium/blob/main/assets/graphics/badge_obtainium.png?raw=true" alt="Obtainium" height="41">](https://apps.obtainium.imranr.dev/redirect?r=obtainium://app/%7B%22id%22%3A%22com.atridad.magiccounter%22%2C%22url%22%3A%22https%3A%2F%2Fgit.atri.dad%2Fatridad%2FMagicCounter%2Freleases%22%2C%22author%22%3A%22git.atri.dad%22%2C%22name%22%3A%22MagicCounter%22%2C%22preferredApkIndex%22%3A0%2C%22additionalSettings%22%3A%22%7B%5C%22intermediateLink%5C%22%3A%5B%5D%2C%5C%22customLinkFilterRegex%5C%22%3A%5C%22%5C%22%2C%5C%22filterByLinkText%5C%22%3Afalse%2C%5C%22skipSort%5C%22%3Afalse%2C%5C%22reverseSort%5C%22%3Afalse%2C%5C%22sortByLastLinkSegment%5C%22%3Afalse%2C%5C%22versionExtractWholePage%5C%22%3Afalse%2C%5C%22requestHeader%5C%22%3A%5B%7B%5C%22requestHeader%5C%22%3A%5C%22User-Agent%3A%20Mozilla%2F5.0%20(Linux%3B%20Android%2010%3B%20K)%20AppleWebKit%2F537.36%20(KHTML%2C%20like%20Gecko)%20Chrome%2F114.0.0.0%20Mobile%20Safari%2F537.36%5C%22%7D%5D%2C%5C%22defaultPseudoVersioningMethod%5C%22%3A%5C%22partialAPKHash%5C%22%2C%5C%22trackOnly%5C%22%3Afalse%2C%5C%22versionExtractionRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22matchGroupToUse%5C%22%3A%5C%22%5C%22%2C%5C%22versionDetection%5C%22%3Afalse%2C%5C%22useVersionCodeAsOSVersion%5C%22%3Afalse%2C%5C%22apkFilterRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22invertAPKFilter%5C%22%3Afalse%2C%5C%22autoApkFilterByArch%5C%22%3Atrue%2C%5C%22appName%5C%22%3A%5C%22%5C%22%2C%5C%22appAuthor%5C%22%3A%5C%22%5C%22%2C%5C%22shizukuPretendToBeGooglePlay%5C%22%3Afalse%2C%5C%22allowInsecure%5C%22%3Afalse%2C%5C%22exemptFromBackgroundUpdates%5C%22%3Afalse%2C%5C%22skipUpdateNotifications%5C%22%3Afalse%2C%5C%22about%5C%22%3A%5C%22%5C%22%2C%5C%22refreshBeforeDownload%5C%22%3Afalse%7D%22%2C%22overrideSource%22%3Anull%7D)
+
+### iOS
+
+TBD
+
+## Requirements
+
+- Android 15+
+- iOS 17+
+
+## Contribution
+
+As this is on my private git this will be difficult to do easily. Get in touch and I can figure something out.

android/.idea/appInsightsSettings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AppInsightsSettings">
+    <option name="selectedTabId" value="Firebase Crashlytics" />
+  </component>
+</project>

android/.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="21" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>

android/.idea/misc.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

android/app/build.gradle.kts

@@ -7,34 +7,43 @@ plugins {
 
 android {
     namespace = "com.atridad.magiccounter"
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "com.atridad.magiccounter"
-        minSdk = 35
-        targetSdk = 35
-        versionCode = 1
-        versionName = "1.0.0"
+        minSdk = 31
+        targetSdk = 36
+        versionCode = 2
+        versionName = "1.2.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
         release {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
         }
     }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
+
     kotlinOptions {
         jvmTarget = "17"
     }
+
+    java {
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(17))
+        }
+    }
+
     buildFeatures {
         compose = true
     }

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

@@ -0,0 +1,487 @@
+package com.atridad.magiccounter.ui
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Settings
+import androidx.compose.material.icons.filled.History
+import androidx.compose.material.icons.filled.PlayArrow
+import androidx.compose.material.icons.filled.Visibility
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.Delete
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.FloatingActionButton
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.snapshots.SnapshotStateList
+import kotlinx.coroutines.delay
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+import com.atridad.magiccounter.ui.screens.GameScreen
+import com.atridad.magiccounter.ui.screens.SetupScreen
+import com.atridad.magiccounter.ui.state.GameState
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.atridad.magiccounter.ui.settings.AppSettingsViewModel
+import com.atridad.magiccounter.ui.settings.ThemeMode
+import com.atridad.magiccounter.ui.settings.MatchRecord
+import com.atridad.magiccounter.ui.theme.MagicCounterTheme
+import com.atridad.magiccounter.ui.theme.CustomIcons
+import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+
+private sealed class Screen {
+    data object Home : Screen()
+    data object Setup : Screen()
+    data object Settings : Screen()
+    data class Game(val matchId: String, val bootState: GameState? = null) : Screen()
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun MagicCounterApp() {
+    val screenStack: SnapshotStateList<Screen> = remember { mutableStateListOf(Screen.Home) }
+    val settingsVm: AppSettingsViewModel = viewModel()
+    val theme = settingsVm.themeMode.collectAsState()
+    val historyState = settingsVm.matchHistory.collectAsState()
+    
+
+
+    MagicCounterTheme(themeMode = theme.value) {
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                title = { Text("Magic Counter", style = MaterialTheme.typography.titleLarge) },
+                navigationIcon = {
+                    if (screenStack.size > 1) {
+                        IconButton(onClick = { screenStack.removeAt(screenStack.lastIndex) }) {
+                            Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Back")
+                        }
+                    }
+                },
+                actions = {
+                    
+                    IconButton(onClick = { screenStack.add(Screen.Settings) }) {
+                        Icon(Icons.Default.Settings, contentDescription = "App settings")
+                    }
+                }
+            )
+        },
+        floatingActionButton = {
+            // Show FAB only on home screen when no active game is running
+            val currentScreen = screenStack.last()
+            if (currentScreen is Screen.Home && historyState.value.none { it.ongoing }) {
+                FloatingActionButton(
+                    onClick = { screenStack.add(Screen.Setup) }
+                ) {
+                    Icon(Icons.Default.PlayArrow, contentDescription = "Start new game")
+                }
+            }
+        }
+    ) { paddingValues ->
+        val currentScreen = screenStack.last()
+        BackHandler(enabled = screenStack.size > 1) { screenStack.removeAt(screenStack.lastIndex) }
+        when (currentScreen) {
+            is Screen.Home -> HomeScreen(
+                modifier = Modifier
+                    .padding(paddingValues)
+                    .fillMaxWidth()
+                    .fillMaxSize(),
+                history = historyState.value,
+                onResume = { record -> screenStack.add(Screen.Game(record.id)) },
+                onStopGame = { record ->
+                    // Stop the active game by marking it as stopped
+                    val current = historyState.value
+                    val idx = current.indexOfFirst { it.id == record.id }
+                    if (idx >= 0) {
+                        val stoppedState = current[idx].state.copy(stopped = true)
+                        val updatedRec = current[idx].copy(
+                            state = stoppedState,
+                            lastUpdatedEpochMs = System.currentTimeMillis(),
+                            ongoing = false,
+                            winnerPlayerId = null
+                        )
+                        val newList = current.toMutableList().apply { set(idx, updatedRec) }
+                        settingsVm.saveHistory(newList)
+                    }
+                },
+                onDelete = { id ->
+                    val newList = historyState.value.filterNot { it.id == id }
+                    settingsVm.saveHistory(newList)
+                }
+            )
+            is Screen.Setup -> SetupScreen(
+                modifier = Modifier
+                    .padding(paddingValues)
+                    .fillMaxSize(),
+                onStart = { name, state ->
+                    // Check if there's already an active game
+                    if (historyState.value.any { it.ongoing }) {
+                        // Navigate back to home screen if a game is already active
+                        screenStack.removeAt(screenStack.lastIndex)
+                        return@SetupScreen
+                    }
+                    
+                    // Create and persist a new MatchRecord
+                    val newId = java.util.UUID.randomUUID().toString()
+                    val now = System.currentTimeMillis()
+                    val record = MatchRecord(
+                        id = newId,
+                        name = name,
+                        startedAtEpochMs = now,
+                        lastUpdatedEpochMs = now,
+                        ongoing = true,
+                        winnerPlayerId = null,
+                        state = state
+                    )
+                    val updated = historyState.value.toMutableList().apply { add(0, record) }
+                    settingsVm.saveHistory(updated)
+                    // Replace Setup with the new Game screen (pop then push)
+                    if (screenStack.isNotEmpty()) screenStack.removeAt(screenStack.lastIndex)
+                    screenStack.add(Screen.Game(newId, state))
+                }
+            )
+            is Screen.Game -> {
+                val id = currentScreen.matchId
+                val bootState = currentScreen.bootState
+                val record = historyState.value.firstOrNull { it.id == id }
+                val stateForGame = record?.state ?: bootState
+                if (stateForGame == null) {
+                    screenStack.removeAt(screenStack.lastIndex)
+                } else {
+                    GameScreen(
+                        modifier = Modifier
+                            .padding(paddingValues)
+                            .fillMaxSize(),
+                        state = stateForGame,
+                        onProgress = { updated ->
+                            val current = historyState.value
+                            val idx = current.indexOfFirst { it.id == id }
+                            if (idx >= 0) {
+                                val updatedRec = current[idx].copy(state = updated, lastUpdatedEpochMs = System.currentTimeMillis())
+                                val newList = current.toMutableList().apply { set(idx, updatedRec) }
+                                settingsVm.saveHistory(newList)
+                            }
+                        },
+                        onWinner = { winnerId, finalState ->
+                            val current = historyState.value
+                            val idx = current.indexOfFirst { it.id == id }
+                            if (idx >= 0) {
+                                val updatedRec = current[idx].copy(
+                                    state = finalState,
+                                    lastUpdatedEpochMs = System.currentTimeMillis(),
+                                    ongoing = false,
+                                    winnerPlayerId = winnerId
+                                )
+                                val newList = current.toMutableList().apply { set(idx, updatedRec) }
+                                settingsVm.saveHistory(newList)
+                            }
+                        },
+                        onStop = { stoppedState ->
+                            val current = historyState.value
+                            val idx = current.indexOfFirst { it.id == id }
+                            if (idx >= 0) {
+                                val updatedRec = current[idx].copy(
+                                    state = stoppedState,
+                                    lastUpdatedEpochMs = System.currentTimeMillis(),
+                                    ongoing = false,
+                                    winnerPlayerId = null
+                                )
+                                val newList = current.toMutableList().apply { set(idx, updatedRec) }
+                                settingsVm.saveHistory(newList)
+                                // Navigate back to home screen
+                                screenStack.removeAt(screenStack.lastIndex)
+                            }
+                        },
+                        onDelete = {
+                            // Delete the current game
+                            val current = historyState.value
+                            val newList = current.filterNot { it.id == id }
+                            settingsVm.saveHistory(newList)
+                            // Navigate back to home screen
+                            screenStack.removeAt(screenStack.lastIndex)
+                        }
+                    )
+                }
+            }
+            is Screen.Settings -> SettingsContent(
+                modifier = Modifier
+                    .padding(paddingValues)
+                    .fillMaxSize(),
+                current = theme.value,
+                onSelect = { settingsVm.setTheme(it) }
+            )
+        }
+        
+
+    }
+    }
+}
+
+@Composable
+private fun SettingsContent(modifier: Modifier, current: ThemeMode, onSelect: (ThemeMode) -> Unit) {
+    Column(
+        modifier = modifier.padding(24.dp), 
+        verticalArrangement = Arrangement.spacedBy(24.dp)
+    ) {
+        Text(
+            "Appearance",
+            style = MaterialTheme.typography.headlineSmall,
+            color = MaterialTheme.colorScheme.primary
+        )
+        
+        Column(verticalArrangement = Arrangement.spacedBy(16.dp)) {
+            Text(
+                "Theme",
+                style = MaterialTheme.typography.titleMedium,
+                color = MaterialTheme.colorScheme.onSurface
+            )
+            Row(
+                horizontalArrangement = Arrangement.spacedBy(12.dp),
+                modifier = Modifier.fillMaxWidth()
+            ) {
+                ThemeMode.entries.forEach { mode ->
+                    androidx.compose.material3.FilterChip(
+                        selected = current == mode,
+                        onClick = { onSelect(mode) },
+                        label = { Text(mode.name) },
+                        modifier = Modifier.weight(1f)
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun HomeScreen(
+    modifier: Modifier,
+    history: List<MatchRecord>,
+    onResume: (MatchRecord) -> Unit,
+    onStopGame: (MatchRecord) -> Unit,
+    onDelete: (String) -> Unit
+) {
+    var pendingDeleteId by remember { mutableStateOf<String?>(null) }
+
+    if (history.isEmpty()) {
+        // Empty state
+        androidx.compose.foundation.layout.Box(
+            modifier = modifier.fillMaxSize(),
+            contentAlignment = Alignment.Center
+        ) {
+            Column(
+                horizontalAlignment = Alignment.CenterHorizontally, 
+                verticalArrangement = Arrangement.spacedBy(16.dp)
+            ) {
+                Icon(
+                    Icons.Default.History, 
+                    contentDescription = "Empty history",
+                    modifier = Modifier.size(64.dp),
+                    tint = MaterialTheme.colorScheme.onSurfaceVariant
+                )
+                Text(
+                    "No games yet", 
+                    style = MaterialTheme.typography.headlineSmall,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                )
+                Text(
+                    "Start your first Magic: The Gathering game to begin tracking life totals and more.",
+                    style = MaterialTheme.typography.bodyMedium,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    textAlign = androidx.compose.ui.text.style.TextAlign.Center
+                )
+            }
+        }
+    } else {
+        // Games list
+        LazyColumn(
+            modifier = modifier.fillMaxSize(),
+            contentPadding = androidx.compose.foundation.layout.PaddingValues(16.dp),
+            verticalArrangement = Arrangement.spacedBy(12.dp)
+        ) {
+            // Active game at the top (if any)
+            val activeGame = history.firstOrNull { it.ongoing }
+            if (activeGame != null) {
+                item {
+                    androidx.compose.material3.Card(
+                        modifier = Modifier.fillMaxWidth(),
+                        colors = androidx.compose.material3.CardDefaults.cardColors(
+                            containerColor = MaterialTheme.colorScheme.primary
+                        ),
+                        onClick = { onResume(activeGame) }
+                    ) {
+                        Row(
+                            modifier = Modifier.fillMaxWidth().padding(16.dp), 
+                            horizontalArrangement = Arrangement.SpaceBetween,
+                            verticalAlignment = Alignment.CenterVertically
+                        ) {
+                            Column(modifier = Modifier.weight(1f)) {
+                                Text(
+                                    "Active Game", 
+                                    style = MaterialTheme.typography.titleMedium,
+                                    color = MaterialTheme.colorScheme.onPrimary
+                                )
+                                Text(
+                                    activeGame.name,
+                                    style = MaterialTheme.typography.bodyLarge,
+                                    color = MaterialTheme.colorScheme.onPrimary
+                                )
+                                GameDuration(
+                                    startTime = activeGame.startedAtEpochMs,
+                                    color = MaterialTheme.colorScheme.onPrimary
+                                )
+                            }
+                            androidx.compose.material3.FilledTonalIconButton(
+                                onClick = { onStopGame(activeGame) },
+                                modifier = Modifier.size(56.dp),
+                                colors = androidx.compose.material3.IconButtonDefaults.filledTonalIconButtonColors(
+                                    containerColor = MaterialTheme.colorScheme.error,
+                                    contentColor = MaterialTheme.colorScheme.onError
+                                )
+                            ) {
+                                Icon(
+                                    CustomIcons.Stop(MaterialTheme.colorScheme.onError),
+                                    contentDescription = "Stop game",
+                                    modifier = Modifier.size(24.dp)
+                                )
+                            }
+                        }
+                    }
+                }
+            }
+
+            // Past games section
+            val pastGames = history.filter { !it.ongoing }
+            items(pastGames, key = { it.id }) { rec ->
+                androidx.compose.material3.Card(
+                    modifier = Modifier.fillMaxWidth(),
+                    colors = androidx.compose.material3.CardDefaults.cardColors(
+                        containerColor = MaterialTheme.colorScheme.surfaceVariant
+                    ),
+                    onClick = { onResume(rec) }
+                ) {
+                    Row(
+                        modifier = Modifier.fillMaxWidth().padding(16.dp), 
+                        horizontalArrangement = Arrangement.SpaceBetween,
+                        verticalAlignment = Alignment.CenterVertically
+                    ) {
+                        Column(modifier = Modifier.weight(1f)) {
+                            Text(
+                                rec.name, 
+                                style = MaterialTheme.typography.bodyLarge,
+                                color = MaterialTheme.colorScheme.onSurfaceVariant
+                            )
+                            val status = if (rec.state.stopped) "Stopped" else "Finished"
+                            val winner = rec.winnerPlayerId?.let { " • Winner: Player ${it + 1}" } ?: ""
+                            val statusText = if (winner.isNotEmpty()) "$status$winner" else status
+                            Text(
+                                statusText,
+                                style = MaterialTheme.typography.bodyMedium,
+                                color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f)
+                            )
+                        }
+                        Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                            androidx.compose.material3.FilledTonalIconButton(
+                                onClick = { onResume(rec) },
+                                modifier = Modifier.size(40.dp),
+                                colors = androidx.compose.material3.IconButtonDefaults.filledTonalIconButtonColors(
+                                    containerColor = MaterialTheme.colorScheme.secondary,
+                                    contentColor = MaterialTheme.colorScheme.onSecondary
+                                )
+                            ) { 
+                                Icon(
+                                    Icons.Default.Visibility, 
+                                    contentDescription = "View match",
+                                    modifier = Modifier.size(20.dp)
+                                ) 
+                            }
+                            androidx.compose.material3.FilledTonalIconButton(
+                                onClick = { pendingDeleteId = rec.id },
+                                modifier = Modifier.size(40.dp),
+                                colors = androidx.compose.material3.IconButtonDefaults.filledTonalIconButtonColors(
+                                    containerColor = MaterialTheme.colorScheme.error,
+                                    contentColor = MaterialTheme.colorScheme.onError
+                                )
+                            ) { 
+                                Icon(
+                                    Icons.Default.Delete, 
+                                    contentDescription = "Delete",
+                                    modifier = Modifier.size(20.dp)
+                                ) 
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        // Confirm delete dialog
+        val pending = history.firstOrNull { it.id == pendingDeleteId }
+        if (pendingDeleteId != null && pending != null) {
+            AlertDialog(
+                onDismissRequest = { pendingDeleteId = null },
+                title = { Text("Delete match?") },
+                text = { Text("Are you sure you want to delete \"${pending.name}\"?") },
+                confirmButton = {
+                    TextButton(onClick = {
+                        onDelete(pendingDeleteId!!)
+                        pendingDeleteId = null
+                    }) { Text("Delete") }
+                },
+                dismissButton = { TextButton(onClick = { pendingDeleteId = null }) { Text("Cancel") } }
+            )
+        }
+    }
+}
+
+@Composable
+private fun GameDuration(
+    startTime: Long,
+    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"
+            }
+            delay(1000)
+        }
+    }
+    
+    Text(
+        text = duration,
+        style = MaterialTheme.typography.bodyMedium,
+        color = color.copy(alpha = 0.8f)
+    )
+}
+
+

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

@@ -17,6 +17,7 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
+import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material.icons.filled.Flag
 import androidx.compose.material.icons.filled.Remove
 import androidx.compose.material3.Card
@@ -24,9 +25,12 @@ import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.FilledTonalIconButton
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
+import androidx.compose.material3.Button
+import androidx.compose.material3.AlertDialog
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableStateMapOf
 import androidx.compose.runtime.mutableStateOf
@@ -42,6 +46,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.atridad.magiccounter.ui.state.GameState
 import com.atridad.magiccounter.ui.state.PlayerState
+import com.atridad.magiccounter.ui.theme.CustomIcons
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
@@ -51,12 +56,16 @@ import com.atridad.magiccounter.ui.state.PlayerState
  * - state: immutable state used to bootstrap the in-memory counters
  * - onProgress: called with a snapshot of the latest state after any user interaction
  * - onWinner: called once when a winner is determined, with (winnerId, finalState)
+ * - onStop: called when the game is manually stopped
+ * - onDelete: called when the game is deleted
  */
 fun GameScreen(
     modifier: Modifier = Modifier,
     state: GameState,
     onProgress: ((GameState) -> Unit)? = null,
-    onWinner: ((Int, GameState) -> Unit)? = null
+    onWinner: ((Int, GameState) -> Unit)? = null,
+    onStop: ((GameState) -> Unit)? = null,
+    onDelete: (() -> Unit)? = null
 ) {
     // Local editable state per player
     val lifeTotals = remember { mutableStateMapOf<Int, Int>() }
@@ -66,6 +75,9 @@ fun GameScreen(
     val eliminated = remember { mutableStateMapOf<Int, Boolean>() }
     // Tracks whether the game has ended. When true, inputs are frozen and the winner is highlighted.
     val gameLocked = remember { mutableStateOf(false) }
+    
+    // State for stop game confirmation
+    val showStopConfirm = remember { mutableStateOf(false) }
 
     // Initialize
     state.players.forEach { p ->
@@ -101,7 +113,45 @@ fun GameScreen(
     )
 
     Column(modifier = modifier.padding(12.dp)) {
-        // Lock game when only one active player remains
+        // Game status and action buttons
+        Row(
+            modifier = Modifier.fillMaxWidth().padding(bottom = 16.dp),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically
+        ) { 
+            // Game status
+            Text(
+                text = if (state.stopped) "Game Stopped" else "Game Active",
+                style = MaterialTheme.typography.titleMedium,
+                color = if (state.stopped) MaterialTheme.colorScheme.error else MaterialTheme.colorScheme.primary
+            )
+            
+            // Action buttons (stop/delete)
+            if (state.stopped) {
+                // Show delete button for stopped games
+                IconButton(
+                    onClick = { onDelete?.invoke() }
+                ) {
+                    Icon(
+                        Icons.Default.Delete,
+                        contentDescription = "Delete game",
+                        tint = MaterialTheme.colorScheme.error
+                    )
+                }
+            } else {
+                // Show stop button for active games
+                IconButton(
+                    onClick = { showStopConfirm.value = true }
+                ) {
+                    Icon(
+                        CustomIcons.Stop(MaterialTheme.colorScheme.error),
+                        contentDescription = "Stop game"
+                    )
+                }
+            }
+        }
+
+        // Lock game when only one active player remains or game is stopped
         val aliveCount = state.players.count { eliminated[it.id] != true }
         val currentWinnerId: Int? = if (aliveCount == 1) {
             state.players.first { eliminated[it.id] != true }.id
@@ -111,6 +161,12 @@ fun GameScreen(
             gameLocked.value = true
             onWinner?.invoke(currentWinnerId, snapshotState())
         }
+        
+        // If game is stopped, lock it
+        if (state.stopped && !gameLocked.value) {
+            gameLocked.value = true
+        }
+        
         val displayPlayers = state.players.sortedBy { eliminated[it.id] == true }
 
         LazyColumn(
@@ -123,6 +179,7 @@ fun GameScreen(
                 val perPlayerCommander: Map<Int, Int> = commanderDamages[player.id]?.toMap() ?: emptyMap()
                 PlayerCard(
                     player = player,
+                    gameState = state,
                     opponents = state.players.map { it.id }.filter { it != player.id },
                     life = lifeTotals[player.id] ?: state.startingLife,
                     onLifeChange = { new ->
@@ -163,6 +220,27 @@ fun GameScreen(
                 )
             }
         }
+        
+        // Stop game confirmation dialog
+        if (showStopConfirm.value) {
+            AlertDialog(
+                onDismissRequest = { showStopConfirm.value = false },
+                title = { Text("Stop Game?") },
+                text = { Text("Are you sure you want to stop this game? This will end the current session.") },
+                confirmButton = {
+                    TextButton(
+                        onClick = {
+                            val stoppedState = snapshotState().copy(stopped = true)
+                            onStop?.invoke(stoppedState)
+                            showStopConfirm.value = false
+                        }
+                    ) { Text("Stop Game") }
+                },
+                dismissButton = { 
+                    TextButton(onClick = { showStopConfirm.value = false }) { Text("Cancel") } 
+                }
+            )
+        }
     }
 }
 
@@ -194,6 +272,7 @@ private fun seatAccentColor(index: Int, scheme: androidx.compose.material3.Color
 @Composable
 private fun PlayerCard(
     player: PlayerState,
+    gameState: GameState,
     opponents: List<Int>,
     life: Int,
     onLifeChange: (Int) -> Unit,
@@ -251,12 +330,22 @@ private fun PlayerCard(
 
             if (isEliminated) {
                 // Skull overlay
-                Text(
-                    text = "☠️",
-                    fontSize = 64.sp,
-                    color = MaterialTheme.colorScheme.error,
-                    modifier = Modifier.align(Alignment.Center).alpha(overlayAlpha.value)
-                )
+                Column(
+                    modifier = Modifier.align(Alignment.Center).alpha(overlayAlpha.value),
+                    horizontalAlignment = Alignment.CenterHorizontally
+                ) {
+                    Icon(
+                        CustomIcons.Skull(MaterialTheme.colorScheme.error),
+                        contentDescription = "Player eliminated",
+                        modifier = Modifier.size(48.dp)
+                    )
+                    Text(
+                        text = "ELIMINATED",
+                        fontSize = 16.sp,
+                        color = MaterialTheme.colorScheme.error,
+                        style = MaterialTheme.typography.labelMedium
+                    )
+                }
             }
         }
     }

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

@@ -0,0 +1,191 @@
+package com.atridad.magiccounter.ui.screens
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.PlayArrow
+import androidx.compose.material3.Button
+import androidx.compose.material3.Checkbox
+import androidx.compose.material3.Icon
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Slider
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import com.atridad.magiccounter.ui.state.GameState
+import com.atridad.magiccounter.ui.state.PlayerState
+import com.atridad.magiccounter.ui.state.defaultPlayerName
+import kotlin.math.roundToInt
+
+@Composable
+fun SetupScreen(
+    modifier: Modifier = Modifier,
+    onStart: (String, GameState) -> Unit
+) {
+    var playerCount by remember { mutableIntStateOf(4) }
+    var startingLife by remember { mutableIntStateOf(40) }
+    var trackPoison by remember { mutableStateOf(true) }
+    var trackCommander by remember { mutableStateOf(true) }
+    var matchName by remember { mutableStateOf("") }
+
+    val names = remember { mutableStateListOf<String>() }
+    LaunchedEffect(playerCount) {
+        while (names.size < playerCount) names.add(defaultPlayerName(names.size))
+        while (names.size > playerCount) names.removeAt(names.lastIndex)
+    }
+
+    Column(
+        modifier = modifier
+            .padding(24.dp)
+            .verticalScroll(rememberScrollState()),
+        verticalArrangement = Arrangement.spacedBy(24.dp)
+    ) {
+        // Game Settings Section
+        Column(verticalArrangement = Arrangement.spacedBy(16.dp)) {
+            Text(
+                "Game Settings",
+                style = androidx.compose.material3.MaterialTheme.typography.headlineSmall,
+                color = androidx.compose.material3.MaterialTheme.colorScheme.primary
+            )
+            
+            Column(verticalArrangement = Arrangement.spacedBy(16.dp)) {
+                Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
+                    Text(
+                        "Starting life: $startingLife",
+                        style = androidx.compose.material3.MaterialTheme.typography.titleMedium
+                    )
+                    Slider(
+                        value = startingLife.toFloat(),
+                        onValueChange = {
+                            val snapped = ((it / 5f).roundToInt() * 5).coerceIn(10, 40)
+                            startingLife = snapped
+                        },
+                        valueRange = 10f..40f,
+                        steps = 5
+                    )
+                }
+                
+                Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
+                    Text(
+                        "Players: $playerCount",
+                        style = androidx.compose.material3.MaterialTheme.typography.titleMedium
+                    )
+                    Slider(
+                        value = playerCount.toFloat(), 
+                        onValueChange = { playerCount = it.toInt() }, 
+                        valueRange = 2f..8f, 
+                        steps = 6
+                    )
+                }
+            }
+        }
+
+        // Game Options Section
+        Column(verticalArrangement = Arrangement.spacedBy(16.dp)) {
+            Text(
+                "Game Options",
+                style = androidx.compose.material3.MaterialTheme.typography.headlineSmall,
+                color = androidx.compose.material3.MaterialTheme.colorScheme.primary
+            )
+            
+            Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
+                Row(verticalAlignment = Alignment.CenterVertically) {
+                    Checkbox(checked = trackCommander, onCheckedChange = { trackCommander = it })
+                    Text(
+                        "Track commander damage",
+                        style = androidx.compose.material3.MaterialTheme.typography.bodyLarge
+                    )
+                }
+                Row(verticalAlignment = Alignment.CenterVertically) {
+                    Checkbox(checked = trackPoison, onCheckedChange = { trackPoison = it })
+                    Text(
+                        "Track poison",
+                        style = androidx.compose.material3.MaterialTheme.typography.bodyLarge
+                    )
+                }
+            }
+        }
+
+        // Match Details Section
+        Column(verticalArrangement = Arrangement.spacedBy(16.dp)) {
+            Text(
+                "Match Details",
+                style = androidx.compose.material3.MaterialTheme.typography.headlineSmall,
+                color = androidx.compose.material3.MaterialTheme.colorScheme.primary
+            )
+            
+            OutlinedTextField(
+                modifier = Modifier.fillMaxWidth(),
+                value = matchName,
+                onValueChange = { matchName = it },
+                label = { Text("Match name") },
+                singleLine = true
+            )
+
+            Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
+                names.forEachIndexed { index, value ->
+                    OutlinedTextField(
+                        modifier = Modifier.fillMaxWidth(),
+                        value = value,
+                        onValueChange = { names[index] = it },
+                        label = { Text("Player ${index + 1} name") },
+                        singleLine = true
+                    )
+                }
+            }
+        }
+
+        Spacer(modifier = Modifier.height(16.dp))
+        
+        // Note: The actual start button is now handled by a FAB in the parent Scaffold
+        // This button is kept for accessibility and as a fallback
+        val canStart = matchName.isNotBlank()
+        Button(
+            onClick = {
+                val players = names.mapIndexed { index, name ->
+                    PlayerState(
+                        id = index,
+                        name = name.ifBlank { defaultPlayerName(index) },
+                        life = startingLife,
+                        poison = 0,
+                        commanderDamages = emptyMap()
+                    )
+                }
+                onStart(
+                    matchName,
+                    GameState(
+                        players = players,
+                        startingLife = startingLife,
+                        trackPoison = trackPoison,
+                        trackCommanderDamage = trackCommander
+                    )
+                )
+            }, 
+            enabled = canStart,
+            modifier = Modifier.fillMaxWidth(),
+            contentPadding = androidx.compose.foundation.layout.PaddingValues(16.dp)
+        ) {
+            Icon(Icons.Default.PlayArrow, contentDescription = null)
+            Spacer(modifier = Modifier.padding(8.dp))
+            Text("Start Game", style = androidx.compose.material3.MaterialTheme.typography.titleMedium)
+        }
+    }
+}
+
+

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

@@ -20,7 +20,8 @@ data class GameState(
     val players: List<PlayerState>,
     val startingLife: Int,
     val trackPoison: Boolean,
-    val trackCommanderDamage: Boolean
+    val trackCommanderDamage: Boolean,
+    val stopped: Boolean = false
 )
 
 fun defaultPlayerName(index: Int): String = "Player ${index + 1}"

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

@@ -0,0 +1,241 @@
+package com.atridad.magiccounter.ui.theme
+
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.graphics.vector.path
+import androidx.compose.ui.unit.dp
+
+object CustomIcons {
+    fun Stop(color: Color = Color.Black): ImageVector = ImageVector.Builder(
+        name = "Stop",
+        defaultWidth = 24.dp,
+        defaultHeight = 24.dp,
+        viewportWidth = 24f,
+        viewportHeight = 24f
+    ).path(
+        fill = SolidColor(color)
+    ) {
+        moveTo(6f, 6f)
+        horizontalLineTo(18f)
+        verticalLineTo(18f)
+        horizontalLineTo(6f)
+        close()
+    }.build()
+
+    fun Pause(color: Color = Color.Black): ImageVector = ImageVector.Builder(
+        name = "Pause",
+        defaultWidth = 24.dp,
+        defaultHeight = 24.dp,
+        viewportWidth = 24f,
+        viewportHeight = 24f
+    ).path(
+        fill = SolidColor(color)
+    ) {
+        moveTo(6f, 19f)
+        horizontalLineTo(10f)
+        verticalLineTo(5f)
+        horizontalLineTo(6f)
+        close()
+        moveTo(14f, 5f)
+        verticalLineTo(19f)
+        horizontalLineTo(18f)
+        verticalLineTo(5f)
+        close()
+    }.build()
+
+    fun Home(color: Color = Color.Black): ImageVector = ImageVector.Builder(
+        name = "Home",
+        defaultWidth = 24.dp,
+        defaultHeight = 24.dp,
+        viewportWidth = 24f,
+        viewportHeight = 24f
+    ).path(
+        fill = SolidColor(color)
+    ) {
+        moveTo(10f, 20f)
+        verticalLineTo(14f)
+        horizontalLineTo(14f)
+        verticalLineTo(20f)
+        horizontalLineTo(19f)
+        verticalLineTo(12f)
+        horizontalLineTo(22f)
+        lineTo(12f, 3f)
+        lineTo(2f, 12f)
+        horizontalLineTo(5f)
+        verticalLineTo(20f)
+        close()
+    }.build()
+
+    fun Trophy(color: Color = Color.Black): ImageVector = ImageVector.Builder(
+        name = "Trophy",
+        defaultWidth = 24.dp,
+        defaultHeight = 24.dp,
+        viewportWidth = 24f,
+        viewportHeight = 24f
+    ).path(
+        fill = SolidColor(color)
+    ) {
+        moveTo(7f, 15f)
+        horizontalLineTo(17f)
+        verticalLineTo(17f)
+        horizontalLineTo(5f)
+        verticalLineTo(15f)
+        close()
+        moveTo(7f, 13f)
+        horizontalLineTo(17f)
+        verticalLineTo(15f)
+        horizontalLineTo(7f)
+        close()
+        moveTo(7f, 11f)
+        horizontalLineTo(17f)
+        verticalLineTo(13f)
+        horizontalLineTo(7f)
+        close()
+        moveTo(7f, 9f)
+        horizontalLineTo(17f)
+        verticalLineTo(11f)
+        horizontalLineTo(7f)
+        close()
+        moveTo(7f, 7f)
+        horizontalLineTo(17f)
+        verticalLineTo(9f)
+        horizontalLineTo(7f)
+        close()
+        moveTo(7f, 5f)
+        horizontalLineTo(17f)
+        verticalLineTo(7f)
+        horizontalLineTo(7f)
+        close()
+        moveTo(7f, 3f)
+        horizontalLineTo(17f)
+        verticalLineTo(5f)
+        horizontalLineTo(7f)
+        close()
+        moveTo(7f, 1f)
+        horizontalLineTo(17f)
+        verticalLineTo(3f)
+        horizontalLineTo(7f)
+        close()
+    }.build()
+
+    fun Skull(color: Color = Color.Black): ImageVector = ImageVector.Builder(
+        name = "Skull",
+        defaultWidth = 24.dp,
+        defaultHeight = 24.dp,
+        viewportWidth = 24f,
+        viewportHeight = 24f
+    ).path(
+        fill = SolidColor(color)
+    ) {
+        moveTo(12f, 2f)
+        curveTo(13.1f, 2f, 14f, 2.9f, 14f, 4f)
+        curveTo(14f, 5.1f, 13.1f, 6f, 12f, 6f)
+        curveTo(10.9f, 6f, 10f, 5.1f, 10f, 4f)
+        curveTo(10f, 2.9f, 10.9f, 2f, 12f, 2f)
+        close()
+        moveTo(21f, 9f)
+        verticalLineTo(7f)
+        lineTo(15f, 7f)
+        lineTo(15f, 5f)
+        curveTo(15f, 3.9f, 14.1f, 3f, 13f, 3f)
+        lineTo(11f, 3f)
+        curveTo(9.9f, 3f, 9f, 3.9f, 9f, 5f)
+        lineTo(9f, 7f)
+        lineTo(3f, 7f)
+        verticalLineTo(9f)
+        lineTo(5f, 9f)
+        verticalLineTo(20f)
+        curveTo(5f, 21.1f, 5.9f, 22f, 7f, 22f)
+        lineTo(17f, 22f)
+        curveTo(18.1f, 22f, 19f, 21.1f, 19f, 20f)
+        lineTo(19f, 9f)
+        lineTo(21f, 9f)
+        close()
+        moveTo(12f, 18f)
+        curveTo(10.9f, 18f, 10f, 17.1f, 10f, 16f)
+        curveTo(10f, 14.9f, 10.9f, 14f, 12f, 14f)
+        curveTo(13.1f, 14f, 14f, 14.9f, 14f, 16f)
+        curveTo(14f, 17.1f, 13.1f, 18f, 12f, 18f)
+        close()
+    }.build()
+
+    fun Poison(color: Color = Color.Black): ImageVector = ImageVector.Builder(
+        name = "Poison",
+        defaultWidth = 24.dp,
+        defaultHeight = 24.dp,
+        viewportWidth = 24f,
+        viewportHeight = 24f
+    ).path(
+        fill = SolidColor(color)
+    ) {
+        moveTo(12f, 2f)
+        curveTo(13.1f, 2f, 14f, 2.9f, 14f, 4f)
+        curveTo(14f, 5.1f, 13.1f, 6f, 12f, 6f)
+        curveTo(10.9f, 6f, 10f, 5.1f, 10f, 4f)
+        curveTo(10f, 2.9f, 10.9f, 2f, 12f, 2f)
+        close()
+        moveTo(21f, 9f)
+        verticalLineTo(7f)
+        lineTo(15f, 7f)
+        lineTo(15f, 5f)
+        curveTo(15f, 3.9f, 14.1f, 3f, 13f, 3f)
+        lineTo(11f, 3f)
+        curveTo(9.9f, 3f, 9f, 3.9f, 9f, 5f)
+        lineTo(9f, 7f)
+        lineTo(3f, 7f)
+        verticalLineTo(9f)
+        lineTo(5f, 9f)
+        verticalLineTo(20f)
+        curveTo(5f, 21.1f, 5.9f, 22f, 7f, 22f)
+        lineTo(17f, 22f)
+        curveTo(18.1f, 22f, 19f, 21.1f, 19f, 20f)
+        lineTo(19f, 9f)
+        lineTo(21f, 9f)
+        close()
+        moveTo(12f, 18f)
+        curveTo(10.9f, 18f, 10f, 17.1f, 10f, 16f)
+        curveTo(10f, 14.9f, 10.9f, 14f, 12f, 14f)
+        curveTo(13.1f, 14f, 14f, 14.9f, 14f, 16f)
+        curveTo(14f, 17.1f, 13.1f, 14f, 12f, 18f)
+        close()
+    }.build()
+
+    fun Sword(color: Color = Color.Black): ImageVector = ImageVector.Builder(
+        name = "Sword",
+        defaultWidth = 24.dp,
+        defaultHeight = 24.dp,
+        viewportWidth = 24f,
+        viewportHeight = 24f
+    ).path(
+        fill = SolidColor(color)
+    ) {
+        moveTo(6.92f, 5f)
+        horizontalLineTo(5.14f)
+        lineTo(4.5f, 5.64f)
+        lineTo(6.92f, 8.07f)
+        lineTo(6.92f, 5f)
+        close()
+        moveTo(19.5f, 8.5f)
+        lineTo(18.79f, 9.21f)
+        lineTo(12.71f, 15.29f)
+        lineTo(13.41f, 16f)
+        horizontalLineTo(17f)
+        verticalLineTo(22f)
+        horizontalLineTo(19f)
+        verticalLineTo(16f)
+        horizontalLineTo(22.59f)
+        lineTo(23.29f, 15.29f)
+        lineTo(17.21f, 9.21f)
+        lineTo(16.5f, 8.5f)
+        lineTo(19.5f, 8.5f)
+        close()
+        moveTo(6.92f, 19f)
+        verticalLineTo(16.93f)
+        lineTo(4.5f, 19.36f)
+        lineTo(5.14f, 20f)
+        horizontalLineTo(6.92f)
+        verticalLineTo(19f)
+        close()
+    }.build()
+}

android/gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-agp = "8.9.0"
+agp = "8.12.1"
 kotlin = "2.0.21"
 coreKtx = "1.10.1"
 junit = "4.13.2"

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sat Aug 09 23:53:05 MDT 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -1,308 +0,0 @@
-package com.atridad.magiccounter.ui
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Settings
-import androidx.compose.material.icons.filled.History
-import androidx.compose.material.icons.filled.PlayArrow
-import androidx.compose.material.icons.filled.Visibility
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.filled.Delete
-import androidx.compose.material3.Button
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateListOf
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.runtime.snapshots.SnapshotStateList
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.unit.dp
-import com.atridad.magiccounter.ui.screens.GameScreen
-import com.atridad.magiccounter.ui.screens.SetupScreen
-import com.atridad.magiccounter.ui.state.GameState
-import androidx.lifecycle.viewmodel.compose.viewModel
-import com.atridad.magiccounter.ui.settings.AppSettingsViewModel
-import com.atridad.magiccounter.ui.settings.ThemeMode
-import com.atridad.magiccounter.ui.settings.MatchRecord
-import com.atridad.magiccounter.ui.theme.MagicCounterTheme
-import androidx.compose.material3.FilterChip
-import androidx.activity.compose.BackHandler
-import androidx.compose.material3.HorizontalDivider
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-
-private sealed class Screen {
-    data object Home : Screen()
-    data object Setup : Screen()
-    data object Settings : Screen()
-    data class Game(val matchId: String, val bootState: GameState? = null) : Screen()
-}
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun MagicCounterApp() {
-    val screenStack: SnapshotStateList<Screen> = remember { mutableStateListOf(Screen.Home) }
-    val settingsVm: AppSettingsViewModel = viewModel()
-    val theme = settingsVm.themeMode.collectAsState()
-    val historyState = settingsVm.matchHistory.collectAsState()
-    
-
-    MagicCounterTheme(themeMode = theme.value) {
-    Scaffold(
-        topBar = {
-            TopAppBar(
-                title = { Text("Magic Counter", style = MaterialTheme.typography.titleLarge) },
-                navigationIcon = {
-                    if (screenStack.size > 1) {
-                        IconButton(onClick = { screenStack.removeLast() }) {
-                            Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Back")
-                        }
-                    }
-                },
-                actions = {
-                    IconButton(onClick = { screenStack.add(Screen.Settings) }) {
-                        Icon(Icons.Default.Settings, contentDescription = "App settings")
-                    }
-                }
-            )
-        }
-    ) { paddingValues ->
-        val currentScreen = screenStack.last()
-        BackHandler(enabled = screenStack.size > 1) { screenStack.removeLast() }
-        when (currentScreen) {
-            is Screen.Home -> HomeScreen(
-                modifier = Modifier
-                    .padding(paddingValues)
-                    .fillMaxSize(),
-                history = historyState.value,
-                onNewGame = { screenStack.add(Screen.Setup) },
-                onResume = { record -> screenStack.add(Screen.Game(record.id)) },
-                onDelete = { id ->
-                    val newList = historyState.value.filterNot { it.id == id }
-                    settingsVm.saveHistory(newList)
-                },
-                onClear = { settingsVm.saveHistory(emptyList()) }
-            )
-            is Screen.Setup -> SetupScreen(
-                modifier = Modifier
-                    .padding(paddingValues)
-                    .fillMaxSize(),
-                onStart = { name, state ->
-                    // Create and persist a new MatchRecord
-                    val newId = java.util.UUID.randomUUID().toString()
-                    val now = System.currentTimeMillis()
-                    val record = MatchRecord(
-                        id = newId,
-                        name = name,
-                        startedAtEpochMs = now,
-                        lastUpdatedEpochMs = now,
-                        ongoing = true,
-                        winnerPlayerId = null,
-                        state = state
-                    )
-                    val updated = historyState.value.toMutableList().apply { add(0, record) }
-                    settingsVm.saveHistory(updated)
-                    // Replace Setup with the new Game screen (pop then push)
-                    if (screenStack.isNotEmpty()) screenStack.removeLast()
-                    screenStack.add(Screen.Game(newId, state))
-                }
-            )
-            is Screen.Game -> {
-                val id = currentScreen.matchId
-                val bootState = currentScreen.bootState
-                val record = historyState.value.firstOrNull { it.id == id }
-                val stateForGame = record?.state ?: bootState
-                if (stateForGame == null) {
-                    screenStack.removeLast()
-                } else {
-                    GameScreen(
-                        modifier = Modifier
-                            .padding(paddingValues)
-                            .fillMaxSize(),
-                        state = stateForGame,
-                        onProgress = { updated ->
-                            val current = historyState.value
-                            val idx = current.indexOfFirst { it.id == id }
-                            if (idx >= 0) {
-                                val updatedRec = current[idx].copy(state = updated, lastUpdatedEpochMs = System.currentTimeMillis())
-                                val newList = current.toMutableList().apply { set(idx, updatedRec) }
-                                settingsVm.saveHistory(newList)
-                            }
-                        },
-                        onWinner = { winnerId, finalState ->
-                            val current = historyState.value
-                            val idx = current.indexOfFirst { it.id == id }
-                            if (idx >= 0) {
-                                val updatedRec = current[idx].copy(
-                                    state = finalState,
-                                    lastUpdatedEpochMs = System.currentTimeMillis(),
-                                    ongoing = false,
-                                    winnerPlayerId = winnerId
-                                )
-                                val newList = current.toMutableList().apply { set(idx, updatedRec) }
-                                settingsVm.saveHistory(newList)
-                            }
-                        }
-                    )
-                }
-            }
-            is Screen.Settings -> SettingsContent(
-                modifier = Modifier
-                    .padding(paddingValues)
-                    .fillMaxSize(),
-                current = theme.value,
-                onSelect = { settingsVm.setTheme(it) }
-            )
-        }
-    }
-    }
-}
-
-@Composable
-private fun SettingsContent(modifier: Modifier, current: ThemeMode, onSelect: (ThemeMode) -> Unit) {
-    Column(modifier = modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(12.dp)) {
-        Text("Theme")
-        Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-            ThemeMode.entries.forEach { mode ->
-                FilterChip(
-                    selected = current == mode,
-                    onClick = { onSelect(mode) },
-                    label = { Text(mode.name) }
-                )
-            }
-        }
-    }
-}
-
-@Composable
-private fun HomeScreen(
-    modifier: Modifier,
-    history: List<MatchRecord>,
-    onNewGame: () -> Unit,
-    onResume: (MatchRecord) -> Unit,
-    onDelete: (String) -> Unit,
-    onClear: () -> Unit
-) {
-    Column(modifier = modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(16.dp)) {
-        var pendingDeleteId by remember { mutableStateOf<String?>(null) }
-        var showClearConfirm by remember { mutableStateOf(false) }
-        Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) {
-            Button(onClick = onNewGame) { Text("New game") }
-            Button(onClick = { showClearConfirm = true }) { Text("Clear history") }
-        }
-
-        if (history.isEmpty()) {
-            androidx.compose.foundation.layout.Box(
-                modifier = Modifier.fillMaxSize(),
-                contentAlignment = Alignment.Center
-            ) {
-                Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                    Icon(Icons.Default.History, contentDescription = "Empty history")
-                    Text("Nothing to see here")
-                    Text("Start a new game to begin.")
-                }
-            }
-        } else {
-            LazyColumn(modifier = Modifier.fillMaxSize(), verticalArrangement = Arrangement.spacedBy(12.dp)) {
-                item {
-                    Column(modifier = Modifier.fillMaxWidth().padding(top = 4.dp, bottom = 4.dp)) {
-                        Text(
-                            "Ongoing",
-                            style = MaterialTheme.typography.titleLarge,
-                            color = MaterialTheme.colorScheme.primary
-                        )
-                        HorizontalDivider()
-                    }
-                }
-                items(history.filter { it.ongoing }, key = { it.id }) { rec ->
-                    Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
-                        Column {
-                            Text(rec.name)
-                            Text("Started ${java.text.DateFormat.getDateTimeInstance().format(java.util.Date(rec.startedAtEpochMs))}")
-                        }
-                        Row {
-                            IconButton(onClick = { onResume(rec) }) { Icon(Icons.Default.PlayArrow, contentDescription = "Resume game") }
-                            IconButton(onClick = { pendingDeleteId = rec.id }) { Icon(Icons.Default.Delete, contentDescription = "Delete") }
-                        }
-                    }
-                }
-
-                item {
-                    Column(modifier = Modifier.fillMaxWidth().padding(top = 8.dp, bottom = 4.dp)) {
-                        Text(
-                            "Finished",
-                            style = MaterialTheme.typography.titleLarge,
-                            color = MaterialTheme.colorScheme.primary
-                        )
-                        HorizontalDivider()
-                    }
-                }
-                items(history.filter { !it.ongoing }, key = { it.id }) { rec ->
-                    Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
-                        Column {
-                            Text(rec.name)
-                            val winner = rec.winnerPlayerId?.let { "Winner: Player ${it + 1}" } ?: ""
-                            Text("Finished • $winner")
-                        }
-                        Row {
-                            IconButton(onClick = { onResume(rec) }) { Icon(Icons.Default.Visibility, contentDescription = "View match") }
-                            IconButton(onClick = { pendingDeleteId = rec.id }) { Icon(Icons.Default.Delete, contentDescription = "Delete") }
-                        }
-                    }
-                }
-            }
-        }
-
-        // Confirm delete dialog
-        val pending = history.firstOrNull { it.id == pendingDeleteId }
-        if (pendingDeleteId != null && pending != null) {
-            AlertDialog(
-                onDismissRequest = { pendingDeleteId = null },
-                title = { Text("Delete match?") },
-                text = { Text("Are you sure you want to delete \"${pending.name}\"?") },
-                confirmButton = {
-                    TextButton(onClick = {
-                        onDelete(pendingDeleteId!!)
-                        pendingDeleteId = null
-                    }) { Text("Delete") }
-                },
-                dismissButton = { TextButton(onClick = { pendingDeleteId = null }) { Text("Cancel") } }
-            )
-        }
-
-        // Confirm clear dialog
-        if (showClearConfirm) {
-            AlertDialog(
-                onDismissRequest = { showClearConfirm = false },
-                title = { Text("Clear history?") },
-                text = { Text("This will remove all matches. This action cannot be undone.") },
-                confirmButton = {
-                    TextButton(onClick = {
-                        onClear()
-                        showClearConfirm = false
-                    }) { Text("Clear") }
-                },
-                dismissButton = { TextButton(onClick = { showClearConfirm = false }) { Text("Cancel") } }
-            )
-        }
-    }
-}
-
-

app/src/main/java/com/atridad/magiccounter/ui/screens/SetupScreen.kt

@@ -1,125 +0,0 @@
-package com.atridad.magiccounter.ui.screens
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.Button
-import androidx.compose.material3.Checkbox
-import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Slider
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.mutableIntStateOf
-import androidx.compose.runtime.mutableStateListOf
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import com.atridad.magiccounter.ui.state.GameState
-import com.atridad.magiccounter.ui.state.PlayerState
-import com.atridad.magiccounter.ui.state.defaultPlayerName
-import kotlin.math.roundToInt
-
-@Composable
-fun SetupScreen(
-    modifier: Modifier = Modifier,
-    onStart: (String, GameState) -> Unit
-) {
-    var playerCount by remember { mutableIntStateOf(4) }
-    var startingLife by remember { mutableIntStateOf(40) }
-    var trackPoison by remember { mutableStateOf(true) }
-    var trackCommander by remember { mutableStateOf(true) }
-    var matchName by remember { mutableStateOf("") }
-
-    val names = remember { mutableStateListOf<String>() }
-    LaunchedEffect(playerCount) {
-        while (names.size < playerCount) names.add(defaultPlayerName(names.size))
-        while (names.size > playerCount) names.removeLast()
-    }
-
-    Column(
-        modifier = modifier
-            .padding(16.dp)
-            .verticalScroll(rememberScrollState()),
-        verticalArrangement = Arrangement.spacedBy(16.dp)
-    ) {
-        Text("Starting life: $startingLife")
-        Slider(
-            value = startingLife.toFloat(),
-            onValueChange = {
-                val snapped = ((it / 5f).roundToInt() * 5).coerceIn(10, 40)
-                startingLife = snapped
-            },
-            valueRange = 10f..40f,
-            steps = 5
-        )
-        Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier.fillMaxWidth()) {
-            Text("Players: $playerCount")
-        }
-        Slider(value = playerCount.toFloat(), onValueChange = { playerCount = it.toInt() }, valueRange = 2f..8f, steps = 6)
-
-        Row(verticalAlignment = Alignment.CenterVertically) {
-            Checkbox(checked = trackCommander, onCheckedChange = { trackCommander = it })
-            Text("Track commander damage")
-        }
-        Row(verticalAlignment = Alignment.CenterVertically) {
-            Checkbox(checked = trackPoison, onCheckedChange = { trackPoison = it })
-            Text("Track poison")
-        }
-
-        OutlinedTextField(
-            modifier = Modifier.fillMaxWidth(),
-            value = matchName,
-            onValueChange = { matchName = it },
-            label = { Text("Match name") }
-        )
-
-        Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
-            names.forEachIndexed { index, value ->
-                OutlinedTextField(
-                    modifier = Modifier.fillMaxWidth(),
-                    value = value,
-                    onValueChange = { names[index] = it },
-                    label = { Text("Player ${index + 1} name") }
-                )
-            }
-        }
-
-        Spacer(modifier = Modifier.height(8.dp))
-        val canStart = matchName.isNotBlank()
-        Button(onClick = {
-            val players = names.mapIndexed { index, name ->
-                PlayerState(
-                    id = index,
-                    name = name.ifBlank { defaultPlayerName(index) },
-                    life = startingLife,
-                    poison = 0,
-                    commanderDamages = emptyMap()
-                )
-            }
-            onStart(
-                matchName,
-                GameState(
-                    players = players,
-                    startingLife = startingLife,
-                    trackPoison = trackPoison,
-                    trackCommanderDamage = trackCommander
-                )
-            )
-        }, enabled = canStart) {
-            Text("Start game")
-        }
-    }
-}
-
-

ios/MagicCounter.xcodeproj/project.pbxproj

@@ -0,0 +1,603 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 77;
+	objects = {
+
+/* Begin PBXContainerItemProxy section */
+		D2DB9B832EE4DD5100372366 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = D2DB9B6B2EE4DD5000372366 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = D2DB9B722EE4DD5000372366;
+			remoteInfo = MagicCounter;
+		};
+		D2DB9B8D2EE4DD5100372366 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = D2DB9B6B2EE4DD5000372366 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = D2DB9B722EE4DD5000372366;
+			remoteInfo = MagicCounter;
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXFileReference section */
+		D2D1FABE2EE4DFF4000700F5 /* MagicCounter.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = MagicCounter.xcodeproj; sourceTree = "<group>"; };
+		D2DB9B732EE4DD5000372366 /* MagicCounter.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MagicCounter.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		D2DB9B822EE4DD5100372366 /* MagicCounterTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MagicCounterTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		D2DB9B8C2EE4DD5100372366 /* MagicCounterUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MagicCounterUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+/* End PBXFileReference section */
+
+/* Begin PBXFileSystemSynchronizedRootGroup section */
+		D2DB9B752EE4DD5000372366 /* MagicCounter */ = {
+			isa = PBXFileSystemSynchronizedRootGroup;
+			path = MagicCounter;
+			sourceTree = "<group>";
+		};
+		D2DB9B852EE4DD5100372366 /* MagicCounterTests */ = {
+			isa = PBXFileSystemSynchronizedRootGroup;
+			path = MagicCounterTests;
+			sourceTree = "<group>";
+		};
+		D2DB9B8F2EE4DD5100372366 /* MagicCounterUITests */ = {
+			isa = PBXFileSystemSynchronizedRootGroup;
+			path = MagicCounterUITests;
+			sourceTree = "<group>";
+		};
+/* End PBXFileSystemSynchronizedRootGroup section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		D2DB9B702EE4DD5000372366 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D2DB9B7F2EE4DD5100372366 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D2DB9B892EE4DD5100372366 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		D2D1FAC22EE4DFF4000700F5 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		D2DB9B6A2EE4DD5000372366 = {
+			isa = PBXGroup;
+			children = (
+				D2DB9B752EE4DD5000372366 /* MagicCounter */,
+				D2DB9B852EE4DD5100372366 /* MagicCounterTests */,
+				D2DB9B8F2EE4DD5100372366 /* MagicCounterUITests */,
+				D2DB9B742EE4DD5000372366 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		D2DB9B742EE4DD5000372366 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				D2DB9B732EE4DD5000372366 /* MagicCounter.app */,
+				D2DB9B822EE4DD5100372366 /* MagicCounterTests.xctest */,
+				D2DB9B8C2EE4DD5100372366 /* MagicCounterUITests.xctest */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		D2DB9B722EE4DD5000372366 /* MagicCounter */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = D2DB9B962EE4DD5100372366 /* Build configuration list for PBXNativeTarget "MagicCounter" */;
+			buildPhases = (
+				D2DB9B6F2EE4DD5000372366 /* Sources */,
+				D2DB9B702EE4DD5000372366 /* Frameworks */,
+				D2DB9B712EE4DD5000372366 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			fileSystemSynchronizedGroups = (
+				D2DB9B752EE4DD5000372366 /* MagicCounter */,
+			);
+			name = MagicCounter;
+			packageProductDependencies = (
+			);
+			productName = MagicCounter;
+			productReference = D2DB9B732EE4DD5000372366 /* MagicCounter.app */;
+			productType = "com.apple.product-type.application";
+		};
+		D2DB9B812EE4DD5100372366 /* MagicCounterTests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = D2DB9B992EE4DD5100372366 /* Build configuration list for PBXNativeTarget "MagicCounterTests" */;
+			buildPhases = (
+				D2DB9B7E2EE4DD5100372366 /* Sources */,
+				D2DB9B7F2EE4DD5100372366 /* Frameworks */,
+				D2DB9B802EE4DD5100372366 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				D2DB9B842EE4DD5100372366 /* PBXTargetDependency */,
+			);
+			fileSystemSynchronizedGroups = (
+				D2DB9B852EE4DD5100372366 /* MagicCounterTests */,
+			);
+			name = MagicCounterTests;
+			packageProductDependencies = (
+			);
+			productName = MagicCounterTests;
+			productReference = D2DB9B822EE4DD5100372366 /* MagicCounterTests.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
+		};
+		D2DB9B8B2EE4DD5100372366 /* MagicCounterUITests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = D2DB9B9C2EE4DD5100372366 /* Build configuration list for PBXNativeTarget "MagicCounterUITests" */;
+			buildPhases = (
+				D2DB9B882EE4DD5100372366 /* Sources */,
+				D2DB9B892EE4DD5100372366 /* Frameworks */,
+				D2DB9B8A2EE4DD5100372366 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				D2DB9B8E2EE4DD5100372366 /* PBXTargetDependency */,
+			);
+			fileSystemSynchronizedGroups = (
+				D2DB9B8F2EE4DD5100372366 /* MagicCounterUITests */,
+			);
+			name = MagicCounterUITests;
+			packageProductDependencies = (
+			);
+			productName = MagicCounterUITests;
+			productReference = D2DB9B8C2EE4DD5100372366 /* MagicCounterUITests.xctest */;
+			productType = "com.apple.product-type.bundle.ui-testing";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		D2DB9B6B2EE4DD5000372366 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				BuildIndependentTargetsInParallel = 1;
+				LastSwiftUpdateCheck = 2610;
+				LastUpgradeCheck = 2610;
+				TargetAttributes = {
+					D2DB9B722EE4DD5000372366 = {
+						CreatedOnToolsVersion = 26.1.1;
+					};
+					D2DB9B812EE4DD5100372366 = {
+						CreatedOnToolsVersion = 26.1.1;
+						TestTargetID = D2DB9B722EE4DD5000372366;
+					};
+					D2DB9B8B2EE4DD5100372366 = {
+						CreatedOnToolsVersion = 26.1.1;
+						TestTargetID = D2DB9B722EE4DD5000372366;
+					};
+				};
+			};
+			buildConfigurationList = D2DB9B6E2EE4DD5000372366 /* Build configuration list for PBXProject "MagicCounter" */;
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				Base,
+			);
+			mainGroup = D2DB9B6A2EE4DD5000372366;
+			minimizedProjectReferenceProxies = 1;
+			preferredProjectObjectVersion = 77;
+			productRefGroup = D2DB9B742EE4DD5000372366 /* Products */;
+			projectDirPath = "";
+			projectReferences = (
+				{
+					ProductGroup = D2D1FAC22EE4DFF4000700F5 /* Products */;
+					ProjectRef = D2D1FABE2EE4DFF4000700F5 /* MagicCounter.xcodeproj */;
+				},
+			);
+			projectRoot = "";
+			targets = (
+				D2DB9B722EE4DD5000372366 /* MagicCounter */,
+				D2DB9B812EE4DD5100372366 /* MagicCounterTests */,
+				D2DB9B8B2EE4DD5100372366 /* MagicCounterUITests */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		D2DB9B712EE4DD5000372366 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D2DB9B802EE4DD5100372366 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D2DB9B8A2EE4DD5100372366 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		D2DB9B6F2EE4DD5000372366 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D2DB9B7E2EE4DD5100372366 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D2DB9B882EE4DD5100372366 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+		D2DB9B842EE4DD5100372366 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = D2DB9B722EE4DD5000372366 /* MagicCounter */;
+			targetProxy = D2DB9B832EE4DD5100372366 /* PBXContainerItemProxy */;
+		};
+		D2DB9B8E2EE4DD5100372366 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = D2DB9B722EE4DD5000372366 /* MagicCounter */;
+			targetProxy = D2DB9B8D2EE4DD5100372366 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
+/* Begin XCBuildConfiguration section */
+		D2DB9B942EE4DD5100372366 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEVELOPMENT_TEAM = 4BC9Y2LL4B;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu17;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 26.1;
+				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+			};
+			name = Debug;
+		};
+		D2DB9B952EE4DD5100372366 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = 4BC9Y2LL4B;
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu17;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 26.1;
+				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				MTL_FAST_MATH = YES;
+				SDKROOT = iphoneos;
+				SWIFT_COMPILATION_MODE = wholemodule;
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		D2DB9B972EE4DD5100372366 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = Logo;
+				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 2;
+				DEVELOPMENT_TEAM = 4BC9Y2LL4B;
+				ENABLE_PREVIEWS = YES;
+				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_KEY_CFBundleDisplayName = MagicCounter;
+				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_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				IPHONEOS_DEPLOYMENT_TARGET = 17.6;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				MARKETING_VERSION = 1.1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.atridad.MagicCounter;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				STRING_CATALOG_GENERATE_SYMBOLS = YES;
+				SWIFT_APPROACHABLE_CONCURRENCY = YES;
+				SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
+				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
+		D2DB9B982EE4DD5100372366 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = Logo;
+				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 2;
+				DEVELOPMENT_TEAM = 4BC9Y2LL4B;
+				ENABLE_PREVIEWS = YES;
+				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_KEY_CFBundleDisplayName = MagicCounter;
+				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_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				IPHONEOS_DEPLOYMENT_TARGET = 17.6;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				MARKETING_VERSION = 1.1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.atridad.MagicCounter;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				STRING_CATALOG_GENERATE_SYMBOLS = YES;
+				SWIFT_APPROACHABLE_CONCURRENCY = YES;
+				SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
+				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Release;
+		};
+		D2DB9B9A2EE4DD5100372366 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = 4BC9Y2LL4B;
+				GENERATE_INFOPLIST_FILE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 26.1;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.atri.dad.MagicCounter.MagicCounterTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				STRING_CATALOG_GENERATE_SYMBOLS = NO;
+				SWIFT_APPROACHABLE_CONCURRENCY = YES;
+				SWIFT_EMIT_LOC_STRINGS = NO;
+				SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MagicCounter.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/MagicCounter";
+			};
+			name = Debug;
+		};
+		D2DB9B9B2EE4DD5100372366 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = 4BC9Y2LL4B;
+				GENERATE_INFOPLIST_FILE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 26.1;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.atri.dad.MagicCounter.MagicCounterTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				STRING_CATALOG_GENERATE_SYMBOLS = NO;
+				SWIFT_APPROACHABLE_CONCURRENCY = YES;
+				SWIFT_EMIT_LOC_STRINGS = NO;
+				SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MagicCounter.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/MagicCounter";
+			};
+			name = Release;
+		};
+		D2DB9B9D2EE4DD5100372366 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = 4BC9Y2LL4B;
+				GENERATE_INFOPLIST_FILE = YES;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.atri.dad.MagicCounter.MagicCounterUITests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				STRING_CATALOG_GENERATE_SYMBOLS = NO;
+				SWIFT_APPROACHABLE_CONCURRENCY = YES;
+				SWIFT_EMIT_LOC_STRINGS = NO;
+				SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				TEST_TARGET_NAME = MagicCounter;
+			};
+			name = Debug;
+		};
+		D2DB9B9E2EE4DD5100372366 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = 4BC9Y2LL4B;
+				GENERATE_INFOPLIST_FILE = YES;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.atri.dad.MagicCounter.MagicCounterUITests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				STRING_CATALOG_GENERATE_SYMBOLS = NO;
+				SWIFT_APPROACHABLE_CONCURRENCY = YES;
+				SWIFT_EMIT_LOC_STRINGS = NO;
+				SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				TEST_TARGET_NAME = MagicCounter;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		D2DB9B6E2EE4DD5000372366 /* Build configuration list for PBXProject "MagicCounter" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				D2DB9B942EE4DD5100372366 /* Debug */,
+				D2DB9B952EE4DD5100372366 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		D2DB9B962EE4DD5100372366 /* Build configuration list for PBXNativeTarget "MagicCounter" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				D2DB9B972EE4DD5100372366 /* Debug */,
+				D2DB9B982EE4DD5100372366 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		D2DB9B992EE4DD5100372366 /* Build configuration list for PBXNativeTarget "MagicCounterTests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				D2DB9B9A2EE4DD5100372366 /* Debug */,
+				D2DB9B9B2EE4DD5100372366 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		D2DB9B9C2EE4DD5100372366 /* Build configuration list for PBXNativeTarget "MagicCounterUITests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				D2DB9B9D2EE4DD5100372366 /* Debug */,
+				D2DB9B9E2EE4DD5100372366 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = D2DB9B6B2EE4DD5000372366 /* Project object */;
+}

ios/MagicCounter.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>

ios/MagicCounter.xcodeproj/xcuserdata/atridad.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>MagicCounter.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>

ios/MagicCounter/Assets.xcassets/AccentColor.colorset/Contents.json

@@ -0,0 +1,11 @@
+{
+  "colors" : [
+    {
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/MagicCounter/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1,35 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "tinted"
+        }
+      ],
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/MagicCounter/Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/MagicCounter/Components.swift

@@ -0,0 +1,131 @@
+//
+//  Components.swift
+//  MagicCounter
+//
+//  Created by Atridad Lahiji on 2025-12-06.
+//
+
+import SwiftUI
+
+/**
+ * A circular button with an icon, used for game controls.
+ */
+struct CircleButton: View {
+    let icon: String
+    let color: Color
+    let size: CGFloat
+    let action: () -> Void
+    
+    init(icon: String, color: Color, size: CGFloat = 44, action: @escaping () -> Void) {
+        self.icon = icon
+        self.color = color
+        self.size = size
+        self.action = action
+    }
+    
+    var body: some View {
+        Button(action: action) {
+            Image(systemName: icon)
+                .font(size < 40 ? .caption : .title3)
+                .frame(width: size, height: size)
+                .background(color.opacity(0.2))
+                .clipShape(Circle())
+                .foregroundStyle(color)
+        }
+    }
+}
+
+/**
+ * A control for adjusting a large numerical value (like Life).
+ */
+struct LifeCounterControl: View {
+    let value: Int
+    let onDecrease: () -> Void
+    let onIncrease: () -> Void
+    
+    var body: some View {
+        HStack(spacing: 16) {
+            CircleButton(icon: "minus", color: .red, action: onDecrease)
+            
+            Text("\(value)")
+                .font(.system(size: 56, weight: .bold, design: .rounded))
+                .minimumScaleFactor(0.5)
+                .lineLimit(1)
+                .foregroundStyle(.primary)
+            
+            CircleButton(icon: "plus", color: .green, action: onIncrease)
+        }
+        .padding(.horizontal, 16)
+    }
+}
+
+/**
+ * A smaller control for adjusting secondary values (like Poison).
+ */
+struct SmallCounterControl: View {
+    let value: Int
+    let icon: String
+    let color: Color
+    let onDecrease: () -> Void
+    let onIncrease: () -> Void
+    
+    var body: some View {
+        HStack(spacing: 4) {
+            CircleButton(icon: "minus", color: .gray, size: 24, action: onDecrease)
+            
+            VStack(spacing: 0) {
+                Image(systemName: icon)
+                    .font(.caption2)
+                    .foregroundStyle(color)
+                Text("\(value)")
+                    .font(.title3.bold())
+                    .foregroundStyle(color)
+            }
+            .frame(minWidth: 30)
+            
+            CircleButton(icon: "plus", color: .gray, size: 24, action: onIncrease)
+        }
+        .padding(6)
+        .background(color.opacity(0.1))
+        .cornerRadius(12)
+    }
+}
+
+/**
+ * A reusable slider row for settings.
+ */
+struct SettingSlider: View {
+    let title: String
+    let value: Binding<Double>
+    let range: ClosedRange<Double>
+    let step: Double
+    
+    var body: some View {
+        VStack(alignment: .leading) {
+            HStack {
+                Text(title)
+                Spacer()
+                Text("\(Int(value.wrappedValue))")
+                    .bold()
+            }
+            Slider(value: value, in: range, step: step)
+        }
+    }
+}
+
+/**
+ * Helper for haptic feedback.
+ */
+enum Haptics {
+    static func play(_ style: UIImpactFeedbackGenerator.FeedbackStyle) {
+        guard UserDefaults.standard.bool(forKey: "hapticFeedbackEnabled") else { return }
+        let generator = UIImpactFeedbackGenerator(style: style)
+        generator.impactOccurred()
+    }
+    
+    static func notification(_ type: UINotificationFeedbackGenerator.FeedbackType) {
+        guard UserDefaults.standard.bool(forKey: "hapticFeedbackEnabled") else { return }
+        let generator = UINotificationFeedbackGenerator()
+        generator.notificationOccurred(type)
+    }
+}

ios/MagicCounter/ContentView.swift

@@ -0,0 +1,129 @@
+//
+//  ContentView.swift
+//  MagicCounter
+//
+//  Created by Atridad Lahiji on 2025-12-06.
+//
+
+import SwiftUI
+
+struct ContentView: View {
+    @EnvironmentObject var gameManager: GameManager
+    @State private var showSetup = false
+    @AppStorage("accentColorName") private var accentColorName = "Blue"
+    
+    var selectedColor: Color {
+        switch accentColorName {
+        case "Blue": return .blue
+        case "Purple": return .purple
+        case "Pink": return .pink
+        case "Red": return .red
+        case "Orange": return .orange
+        case "Green": return .green
+        case "Teal": return .teal
+        case "Indigo": return .indigo
+        case "Mint": return .mint
+        case "Brown": return .brown
+        case "Cyan": return .cyan
+        default: return .blue
+        }
+    }
+
+    var body: some View {
+        Group {
+            if let activeMatch = gameManager.activeMatch {
+                GameView(match: activeMatch)
+                    .transition(.move(edge: .bottom))
+            } else {
+                TabView {
+                    NavigationStack {
+                        List {
+                            if gameManager.matchHistory.isEmpty {
+                                ContentUnavailableView("No Matches", systemImage: "gamecontroller", description: Text("Start a new game to begin tracking."))
+                            } else {
+                                ForEach(gameManager.matchHistory) { match in
+                                    MatchHistoryRow(match: match)
+                                        .contentShape(Rectangle()) // Ensure the whole row is tappable
+                                        .onTapGesture {
+                                            withAnimation {
+                                                gameManager.resumeMatch(match)
+                                            }
+                                        }
+                                        .swipeActions(edge: .trailing, allowsFullSwipe: true) {
+                                            Button(role: .destructive) {
+                                                withAnimation {
+                                                    gameManager.deleteMatch(id: match.id)
+                                                }
+                                            } label: {
+                                                Label("Delete", systemImage: "trash")
+                                            }
+                                            .tint(.red)
+                                        }
+                                }
+                            }
+                        }
+                        .listStyle(.insetGrouped)
+                        .navigationTitle("Games")
+                        .toolbar {
+                            ToolbarItem(placement: .primaryAction) {
+                                Button(action: { showSetup = true }) {
+                                    Image(systemName: "plus")
+                                }
+                            }
+                        }
+                    }
+                    .tabItem {
+                        Label("Games", systemImage: "clock.fill")
+                    }
+                    
+                    SettingsView()
+                        .tabItem {
+                            Label("Settings", systemImage: "gear")
+                        }
+                }
+            }
+        }
+        .tint(selectedColor)
+        .sheet(isPresented: $showSetup) {
+            SetupView()
+                .tint(selectedColor)
+        }
+    }
+}
+
+struct MatchHistoryRow: View {
+    let match: MatchRecord
+    
+    var body: some View {
+        HStack {
+            VStack(alignment: .leading) {
+                Text(match.name)
+                    .font(.headline)
+                    .foregroundStyle(.primary)
+                Text(match.startedAt.formatted(date: .abbreviated, time: .shortened))
+                    .font(.caption)
+                    .foregroundStyle(.secondary)
+            }
+            Spacer()
+            
+            if match.state.stopped {
+                Text("Stopped")
+                    .font(.caption)
+                    .foregroundStyle(.secondary)
+            } else if let winner = match.state.winner {
+                Text("Winner: \(winner.name)")
+                    .font(.caption)
+                    .foregroundStyle(.secondary)
+            } else {
+                Text("Ongoing")
+                    .font(.caption)
+                    .padding(.horizontal, 8)
+                    .padding(.vertical, 4)
+                    .background(Color.green.opacity(0.2))
+                    .foregroundStyle(.green)
+                    .cornerRadius(8)
+            }
+        }
+        .padding(.vertical, 8)
+    }
+}

ios/MagicCounter/GameManager.swift

@@ -0,0 +1,137 @@
+//
+//  GameManager.swift
+//  MagicCounter
+//
+//  Created by Atridad Lahiji on 2025-12-06.
+//
+
+import Foundation
+import SwiftUI
+import Combine
+
+/**
+ * Manages the global game state and match history.
+ *
+ * - matchHistory: List of all past and current matches.
+ * - activeMatch: The currently active match, if any.
+ */
+@MainActor
+final class GameManager: ObservableObject {
+    @Published var matchHistory: [MatchRecord] = []
+    @Published var activeMatch: MatchRecord?
+    
+    private let historyKey = "match_history_json"
+    private let saveSubject = PassthroughSubject<Void, Never>()
+    private var cancellables = Set<AnyCancellable>()
+    
+    nonisolated init() {
+        Task { @MainActor in
+            self.loadHistory()
+            self.setupAutoSave()
+        }
+    }
+    
+    private func setupAutoSave() {
+        saveSubject
+            .debounce(for: .seconds(1), scheduler: RunLoop.main)
+            .sink { [weak self] _ in
+                self?.saveHistory()
+            }
+            .store(in: &cancellables)
+    }
+    
+    func startNewGame(players: [String], startingLife: Int, trackPoison: Bool, trackCommander: Bool, matchName: String) {
+        let playerStates = players.enumerated().map { (index, name) in
+            PlayerState(
+                id: index,
+                name: name,
+                life: startingLife,
+                poison: 0,
+                commanderDamages: [:],
+                scooped: false
+            )
+        }
+        
+        let gameState = GameState(
+            players: playerStates,
+            startingLife: startingLife,
+            trackPoison: trackPoison,
+            trackCommanderDamage: trackCommander,
+            stopped: false
+        )
+        
+        let newMatch = MatchRecord(
+            id: UUID().uuidString,
+            name: matchName.isEmpty ? "Match \(Date().formatted())" : matchName,
+            startedAt: Date(),
+            lastUpdated: Date(),
+            ongoing: true,
+            winnerPlayerId: nil,
+            state: gameState
+        )
+        
+        activeMatch = newMatch
+        matchHistory.insert(newMatch, at: 0)
+        saveHistory()
+    }
+    
+    func updateActiveGame(state: GameState) {
+        guard var match = activeMatch else { return }
+        match.state = state
+        match.lastUpdated = Date()
+        
+        if state.stopped {
+            match.ongoing = false
+        } else if let winner = state.winner {
+            match.ongoing = false
+            match.winnerPlayerId = winner.id
+        } else {
+            match.ongoing = true
+            match.winnerPlayerId = nil
+        }
+        
+        activeMatch = match
+        if let index = matchHistory.firstIndex(where: { $0.id == match.id }) {
+            matchHistory[index] = match
+        }
+        saveSubject.send()
+    }
+    
+    func stopGame() {
+        guard var match = activeMatch else { return }
+        match.ongoing = false
+        match.state.stopped = true
+        activeMatch = nil
+        
+        if let index = matchHistory.firstIndex(where: { $0.id == match.id }) {
+            matchHistory[index] = match
+        }
+        saveHistory()
+    }
+    
+    func deleteMatch(id: String) {
+        if activeMatch?.id == id {
+            activeMatch = nil
+        }
+        matchHistory.removeAll { $0.id == id }
+        saveHistory()
+    }
+    
+    func resumeMatch(_ match: MatchRecord) {
+        activeMatch = match
+    }
+    
+    private func loadHistory() {
+        if let data = UserDefaults.standard.data(forKey: historyKey) {
+            if let decoded = try? JSONDecoder().decode([MatchRecord].self, from: data) {
+                matchHistory = decoded
+            }
+        }
+    }
+    
+    private func saveHistory() {
+        if let encoded = try? JSONEncoder().encode(matchHistory) {
+            UserDefaults.standard.set(encoded, forKey: historyKey)
+        }
+    }
+}

ios/MagicCounter/GameView.swift

@@ -0,0 +1,393 @@
+//
+//  GameView.swift
+//  MagicCounter
+//
+//  Created by Atridad Lahiji on 2025-12-06.
+//
+
+import SwiftUI
+import UniformTypeIdentifiers
+
+/**
+ * Main game screen displaying the grid of players.
+ *
+ * - match: The match record to initialize the game state from.
+ */
+struct GameView: View {
+    @EnvironmentObject var gameManager: GameManager
+    @State private var gameState: GameState
+    @State private var showingStopConfirmation = false
+    @State private var selectedPlayerForCommander: PlayerState?
+    @State private var draggedPlayer: PlayerState?
+    
+    init(match: MatchRecord) {
+        self._gameState = State(initialValue: match.state)
+    }
+    
+    var body: some View {
+        ZStack {
+            // Background
+            LinearGradient(colors: [Color.black, Color.indigo.opacity(0.5)], startPoint: .top, endPoint: .bottom)
+                .ignoresSafeArea()
+            
+            VStack(spacing: 0) {
+                // Custom Toolbar
+                HStack {
+                    Button(action: { gameManager.activeMatch = nil }) {
+                        Image(systemName: "xmark")
+                            .font(.system(size: 16, weight: .bold))
+                            .foregroundColor(.white)
+                            .padding(10)
+                            .background(.ultraThinMaterial)
+                            .clipShape(Circle())
+                    }
+                    
+                    Spacer()
+                    
+                    if gameState.stopped {
+                        Text("Game Stopped")
+                            .font(.headline)
+                            .foregroundStyle(.red)
+                            .padding(.horizontal, 12)
+                            .padding(.vertical, 6)
+                            .background(.ultraThinMaterial)
+                            .cornerRadius(8)
+                    } else if let winner = gameState.winner {
+                        Text("Winner: \(winner.name)")
+                            .font(.headline)
+                            .foregroundStyle(.green)
+                            .padding(.horizontal, 12)
+                            .padding(.vertical, 6)
+                            .background(.ultraThinMaterial)
+                            .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 {
+                        Color.clear.frame(width: 40, height: 40)
+                    }
+                }
+                .padding()
+                .background(.ultraThinMaterial)
+                
+                // Players Grid
+                GeometryReader { geometry in
+                    let columns = [GridItem(.adaptive(minimum: 320), spacing: 24)]
+                    ScrollView {
+                        LazyVGrid(columns: columns, spacing: 24) {
+                            ForEach(gameState.players) { player in
+                                PlayerCell(
+                                    player: player,
+                                    gameState: gameState,
+                                    isWinner: gameState.winner?.id == player.id,
+                                    onUpdate: updatePlayer,
+                                    onCommanderTap: { selectedPlayerForCommander = player },
+                                    onScoop: { scoopPlayer(player) }
+                                )
+                                .frame(height: 260)
+                                .onDrag {
+                                    self.draggedPlayer = player
+                                    return NSItemProvider(object: String(player.id) as NSString)
+                                }
+                                .onDrop(of: [.text], delegate: PlayerDropDelegate(item: player, items: $gameState.players, draggedItem: $draggedPlayer))
+                            }
+                        }
+                        .padding(24)
+                    }
+                }
+            }
+        }
+        .alert("Stop Game?", isPresented: $showingStopConfirmation) {
+            Button("Cancel", role: .cancel) { }
+            Button("Stop", role: .destructive) {
+                gameManager.stopGame()
+                gameState.stopped = true
+            }
+        } message: {
+            Text("Are you sure you want to stop this game?")
+        }
+        .sheet(item: $selectedPlayerForCommander) { player in
+            CommanderDamageView(
+                targetPlayer: player,
+                gameState: gameState,
+                onUpdate: { updatedPlayer in
+                    updatePlayer(player: updatedPlayer)
+                }
+            )
+            .presentationDetents([.medium])
+        }
+        .onChange(of: gameState) { newState in
+            if newState.winner != nil {
+                Haptics.notification(.success)
+            }
+            gameManager.updateActiveGame(state: newState)
+        }
+    }
+    
+    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)
+    }
+}
+
+/**
+ * Individual player cell component.
+ *
+ * - player: The player state to display.
+ * - gameState: The global game state.
+ * - isWinner: Whether this player is the winner.
+ * - onUpdate: Callback to update the player state.
+ * - onCommanderTap: Callback when commander damage button is tapped.
+ * - onScoop: Callback when scoop action is triggered.
+ */
+struct PlayerCell: View {
+    let player: PlayerState
+    let gameState: GameState
+    let isWinner: Bool
+    let onUpdate: (PlayerState) -> Void
+    let onCommanderTap: () -> Void
+    let onScoop: () -> Void
+    
+    @State private var showScoopConfirmation = false
+    
+    var body: some View {
+        ZStack {
+            RoundedRectangle(cornerRadius: 24)
+                .fill(.ultraThinMaterial)
+                .shadow(color: isWinner ? .green.opacity(0.5) : .black.opacity(0.2), radius: isWinner ? 20 : 10, x: 0, y: 5)
+                .overlay(
+                    RoundedRectangle(cornerRadius: 24)
+                        .stroke(isWinner ? Color.green : Color.clear, lineWidth: 3)
+                )
+            
+            VStack(spacing: 12) {
+                // Header
+                HStack {
+                    Text(player.name)
+                        .font(.headline)
+                        .lineLimit(1)
+                        .minimumScaleFactor(0.8)
+                        .foregroundStyle(.primary)
+                    Spacer()
+                    
+                    Button(action: { showScoopConfirmation = true }) {
+                        Image(systemName: "flag.fill")
+                            .foregroundStyle(.secondary)
+                            .padding(4)
+                    }
+                }
+                .padding(.horizontal)
+                .padding(.top, 12)
+                
+                // Life
+                LifeCounterControl(
+                    value: player.life,
+                    onDecrease: { adjustLife(by: -1) },
+                    onIncrease: { adjustLife(by: 1) }
+                )
+                
+                Spacer()
+                
+                // Counters Row
+                HStack(spacing: 12) {
+                    if gameState.trackPoison {
+                        SmallCounterControl(
+                            value: player.poison,
+                            icon: "drop.fill",
+                            color: .purple,
+                            onDecrease: { adjustPoison(by: -1) },
+                            onIncrease: { adjustPoison(by: 1) }
+                        )
+                    }
+                    
+                    if gameState.trackCommanderDamage {
+                        Button(action: onCommanderTap) {
+                            VStack(spacing: 2) {
+                                Image(systemName: "shield.fill")
+                                    .font(.caption)
+                                Text("CMD")
+                                    .font(.caption2.bold())
+                            }
+                            .frame(width: 44, height: 44)
+                            .background(Color.orange.opacity(0.1))
+                            .foregroundStyle(.orange)
+                            .clipShape(Circle())
+                        }
+                    }
+                }
+                .padding(.bottom, 16)
+            }
+            
+            if player.isEliminated && !isWinner {
+                ZStack {
+                    Color.black.opacity(0.6)
+                        .cornerRadius(24)
+                    Image(systemName: "xmark")
+                        .font(.system(size: 60, weight: .bold))
+                        .foregroundStyle(.white.opacity(0.8))
+                }
+            }
+        }
+        .opacity(player.isEliminated && !isWinner ? 0.8 : 1)
+        .scaleEffect(isWinner ? 1.05 : 1)
+        .animation(.spring, value: isWinner)
+        .alert("Scoop?", isPresented: $showScoopConfirmation) {
+            Button("Cancel", role: .cancel) { }
+            Button("Scoop", role: .destructive) {
+                Haptics.notification(.warning)
+                onScoop()
+            }
+        } message: {
+            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)
+        }
+    }
+}
+
+/**
+ * Sheet for managing commander damage received by a player.
+ *
+ * - targetPlayer: The player receiving damage.
+ * - gameState: The global game state.
+ * - onUpdate: Callback to update the player state.
+ */
+struct CommanderDamageView: View {
+    @Environment(\.dismiss) var dismiss
+    let targetPlayer: PlayerState
+    let gameState: GameState
+    let onUpdate: (PlayerState) -> Void
+    
+    var body: some View {
+        NavigationStack {
+            List {
+                ForEach(gameState.players.filter { $0.id != targetPlayer.id }) { attacker in
+                    HStack {
+                        Text(attacker.name)
+                            .font(.headline)
+                        Spacer()
+                        HStack(spacing: 16) {
+                            CircleButton(
+                                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)")
+            .navigationBarTitleDisplayMode(.inline)
+            .toolbar {
+                ToolbarItem(placement: .confirmationAction) {
+                    Button("Done") { dismiss() }
+                }
+            }
+        }
+    }
+    
+    private func adjustCommanderDamage(attackerId: Int, by amount: Int) {
+        Haptics.play(.light)
+        var newPlayer = targetPlayer
+        var damages = newPlayer.commanderDamages
+        let current = damages[attackerId] ?? 0
+        damages[attackerId] = max(0, current + amount)
+        newPlayer.commanderDamages = damages
+        onUpdate(newPlayer)
+        
+        if newPlayer.isEliminated && !targetPlayer.isEliminated {
+            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/Item.swift

@@ -0,0 +1,18 @@
+//
+//  Item.swift
+//  MagicCounter
+//
+//  Created by Atridad Lahiji on 2025-12-06.
+//
+
+import Foundation
+import SwiftData
+
+@Model
+final class Item {
+    var timestamp: Date
+    
+    init(timestamp: Date) {
+        self.timestamp = timestamp
+    }
+}

ios/MagicCounter/Logo.icon/icon.json

@@ -0,0 +1,37 @@
+{
+  "color-space-for-untagged-svg-colors" : "display-p3",
+  "fill" : {
+    "automatic-gradient" : "display-p3:0.20140,0.16683,0.29537,1.00000"
+  },
+  "groups" : [
+    {
+      "layers" : [
+        {
+          "image-name" : "logo 2.png",
+          "name" : "logo",
+          "position" : {
+            "scale" : 0.85,
+            "translation-in-points" : [
+              0,
+              0
+            ]
+          }
+        }
+      ],
+      "shadow" : {
+        "kind" : "neutral",
+        "opacity" : 0.5
+      },
+      "translucency" : {
+        "enabled" : true,
+        "value" : 0.5
+      }
+    }
+  ],
+  "supported-platforms" : {
+    "circles" : [
+      "watchOS"
+    ],
+    "squares" : "shared"
+  }
+}

ios/MagicCounter/MagicCounterApp.swift

@@ -0,0 +1,27 @@
+//
+//  MagicCounterApp.swift
+//  MagicCounter
+//
+//  Created by Atridad Lahiji on 2025-12-06.
+//
+
+import SwiftUI
+
+@main
+struct MagicCounterApp: App {
+    @StateObject private var gameManager = GameManager()
+    
+    init() {
+        UserDefaults.standard.register(defaults: [
+            "hapticFeedbackEnabled": true
+        ])
+    }
+
+    var body: some Scene {
+        WindowGroup {
+            ContentView()
+                .environmentObject(gameManager)
+                .preferredColorScheme(.dark) // Force dark mode for that "Liquid Glass" feel usually looks better, or let it adapt.
+        }
+    }
+}

ios/MagicCounter/Models.swift

@@ -0,0 +1,50 @@
+//
+//  Models.swift
+//  MagicCounter
+//
+//  Created by Atridad Lahiji on 2025-12-06.
+//
+
+import Foundation
+
+// A single player's state
+struct PlayerState: Codable, Identifiable, Equatable {
+    var id: Int
+    var name: String
+    var life: Int
+    var poison: Int
+    var commanderDamages: [Int: Int] // attackerId: damage
+    var scooped: Bool
+    
+    var isEliminated: Bool {
+        life <= 0 || scooped || commanderDamages.values.contains { $0 >= 21 } || poison >= 10
+    }
+}
+
+// The full game state
+struct GameState: Codable, Equatable {
+    var players: [PlayerState]
+    var startingLife: Int
+    var trackPoison: Bool
+    var trackCommanderDamage: Bool
+    var stopped: Bool
+    
+    var winner: PlayerState? {
+        let activePlayers = players.filter { !$0.isEliminated }
+        if activePlayers.count == 1 {
+            return activePlayers.first
+        }
+        return nil
+    }
+}
+
+// A record of a match
+struct MatchRecord: Codable, Identifiable, Equatable {
+    var id: String
+    var name: String
+    var startedAt: Date
+    var lastUpdated: Date
+    var ongoing: Bool
+    var winnerPlayerId: Int?
+    var state: GameState
+}

ios/MagicCounter/SettingsView.swift

@@ -0,0 +1,104 @@
+//
+//  SettingsView.swift
+//  MagicCounter
+//
+//  Created by Atridad Lahiji on 2025-12-06.
+//
+
+import SwiftUI
+
+struct SettingsView: View {
+    @AppStorage("accentColorName") private var accentColorName = "Blue"
+    @AppStorage("hapticFeedbackEnabled") private var hapticFeedbackEnabled = true
+    
+    private let colors: [(name: String, color: Color)] = [
+        ("Blue", .blue),
+        ("Purple", .purple),
+        ("Pink", .pink),
+        ("Red", .red),
+        ("Orange", .orange),
+        ("Green", .green),
+        ("Teal", .teal),
+        ("Indigo", .indigo),
+        ("Mint", .mint),
+        ("Brown", .brown),
+        ("Cyan", .cyan)
+    ]
+    
+    private var currentVersion: String {
+        Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "1.0"
+    }
+    
+    private var buildNumber: String {
+        Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? "1"
+    }
+    
+    private func foregroundColor(for colorName: String) -> Color {
+        switch colorName {
+        case "Mint", "Cyan", "Yellow":
+            return .black
+        default:
+            return .white
+        }
+    }
+    
+    var body: some View {
+        NavigationStack {
+            Form {
+                Section("General") {
+                    Toggle("Haptic Feedback", isOn: $hapticFeedbackEnabled)
+                }
+                
+                Section("Appearance") {
+                    VStack(alignment: .leading, spacing: 16) {
+                        Text("ACCENT COLOR")
+                            .font(.caption)
+                            .foregroundStyle(.secondary)
+                        
+                        LazyVGrid(columns: [GridItem(.adaptive(minimum: 44))], spacing: 12) {
+                            ForEach(colors, id: \.name) { item in
+                                Circle()
+                                    .fill(item.color)
+                                    .frame(width: 44, height: 44)
+                                    .overlay {
+                                        if accentColorName == item.name {
+                                            Image(systemName: "checkmark")
+                                                .font(.headline)
+                                                .foregroundStyle(foregroundColor(for: item.name))
+                                        }
+                                    }
+                                    .onTapGesture {
+                                        accentColorName = item.name
+                                    }
+                            }
+                        }
+                        
+                        Divider()
+                        
+                        Button("Reset to Default") {
+                            accentColorName = "Blue"
+                        }
+                        .foregroundStyle(.red)
+                    }
+                    .padding(.vertical, 8)
+                }
+                
+                Section("About") {
+                    HStack {
+                        Text("App Name")
+                        Spacer()
+                        Text("Magic Counter")
+                            .foregroundStyle(.secondary)
+                    }
+                    HStack {
+                        Text("Version")
+                        Spacer()
+                        Text("\(currentVersion) (\(buildNumber))")
+                            .foregroundStyle(.secondary)
+                    }
+                }
+            }
+            .navigationTitle("Settings")
+        }
+    }
+}

ios/MagicCounter/SetupView.swift

@@ -0,0 +1,100 @@
+//
+//  SetupView.swift
+//  MagicCounter
+//
+//  Created by Atridad Lahiji on 2025-12-06.
+//
+
+import SwiftUI
+
+/**
+ * Screen for configuring a new game.
+ *
+ * Allows setting player count, starting life, and game options.
+ */
+struct SetupView: View {
+    @Environment(\.dismiss) var dismiss
+    @EnvironmentObject var gameManager: GameManager
+    
+    @State private var playerCount: Double = 4
+    @State private var startingLife: Double = 40
+    @State private var trackPoison = true
+    @State private var trackCommander = true
+    @State private var matchName = ""
+    @State private var playerNames: [String] = []
+    
+    var body: some View {
+        NavigationStack {
+            Form {
+                Section("Game Settings") {
+                    SettingSlider(
+                        title: "Starting Life",
+                        value: $startingLife,
+                        range: 10...40,
+                        step: 5
+                    )
+                    
+                    SettingSlider(
+                        title: "Players",
+                        value: $playerCount,
+                        range: 2...8,
+                        step: 1
+                    )
+                    .onChange(of: playerCount) { newValue in
+                        updatePlayerNames(count: Int(newValue))
+                    }
+                }
+                
+                Section("Options") {
+                    Toggle("Track Poison", isOn: $trackPoison)
+                    Toggle("Track Commander Damage", isOn: $trackCommander)
+                    TextField("Match Name (Optional)", text: $matchName)
+                }
+                
+                Section("Player Names") {
+                    ForEach(0..<playerNames.count, id: \.self) { index in
+                        TextField("Player \(index + 1)", text: $playerNames[index])
+                    }
+                }
+            }
+            .navigationTitle("New Game")
+            .navigationBarTitleDisplayMode(.inline)
+            .toolbar {
+                ToolbarItem(placement: .cancellationAction) {
+                    Button("Cancel") {
+                        dismiss()
+                    }
+                }
+                ToolbarItem(placement: .confirmationAction) {
+                    Button("Start") {
+                        startGame()
+                    }
+                    .bold()
+                }
+            }
+            .onAppear {
+                updatePlayerNames(count: Int(playerCount))
+            }
+        }
+    }
+    
+    private func updatePlayerNames(count: Int) {
+        while playerNames.count < count {
+            playerNames.append("Player \(playerNames.count + 1)")
+        }
+        while playerNames.count > count {
+            playerNames.removeLast()
+        }
+    }
+    
+    private func startGame() {
+        gameManager.startNewGame(
+            players: playerNames,
+            startingLife: Int(startingLife),
+            trackPoison: trackPoison,
+            trackCommander: trackCommander,
+            matchName: matchName
+        )
+        dismiss()
+    }
+}

ios/MagicCounterTests/MagicCounterTests.swift

@@ -0,0 +1,17 @@
+//
+//  MagicCounterTests.swift
+//  MagicCounterTests
+//
+//  Created by Atridad Lahiji on 2025-12-06.
+//
+
+import Testing
+@testable import MagicCounter
+
+struct MagicCounterTests {
+
+    @Test func example() async throws {
+        // Todo: Add SOME form of test lol
+    }
+
+}

ios/MagicCounterUITests/MagicCounterUITests.swift

@@ -0,0 +1,31 @@
+//
+//  MagicCounterUITests.swift
+//  MagicCounterUITests
+//
+//  Created by Atridad Lahiji on 2025-12-06.
+//
+
+import XCTest
+
+final class MagicCounterUITests: XCTestCase {
+
+    override func setUpWithError() throws {
+        continueAfterFailure = false
+    }
+
+    override func tearDownWithError() throws {
+    }
+
+    @MainActor
+    func testExample() throws {
+        let app = XCUIApplication()
+        app.launch()
+    }
+
+    @MainActor
+    func testLaunchPerformance() throws {
+        measure(metrics: [XCTApplicationLaunchMetric()]) {
+            XCUIApplication().launch()
+        }
+    }
+}

ios/MagicCounterUITests/MagicCounterUITestsLaunchTests.swift

@@ -0,0 +1,30 @@
+//
+//  MagicCounterUITestsLaunchTests.swift
+//  MagicCounterUITests
+//
+//  Created by Atridad Lahiji on 2025-12-06.
+//
+
+import XCTest
+
+final class MagicCounterUITestsLaunchTests: XCTestCase {
+
+    override class var runsForEachTargetApplicationUIConfiguration: Bool {
+        true
+    }
+
+    override func setUpWithError() throws {
+        continueAfterFailure = false
+    }
+
+    @MainActor
+    func testLaunch() throws {
+        let app = XCUIApplication()
+        app.launch()
+
+        let attachment = XCTAttachment(screenshot: app.screenshot())
+        attachment.name = "Launch Screen"
+        attachment.lifetime = .keepAlways
+        add(attachment)
+    }
+}