Update README.md

Reviewed-on: #55

.github/workflows/build.yml

@@ -48,17 +48,17 @@ jobs:
           cache: 'gradle'
 
       - name: Build APK
-        run: ./gradlew assemble
+        run: ./gradlew assembleSignedRelease
-
-      # - name: Upload APK
-      #   uses: actions/upload-artifact@v4
-      #   with:
-      #     name: app.apk
-      #     path: app/build/outputs/apk/release/app-release.apk
 
       - name: Release
         uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')
         with:
           files: |
-            app/build/outputs/apk/release/app-release.apk   
+            app/build/outputs/apk/signedRelease/app-signedRelease.apk
+          prerelease: |
+            if [[ ${{ github.ref }} =~ ^refs/tags/[0-9]+\.[0-9]+[a-z]+$ ]]; then
+              echo "false"
+            else
+              echo "true"
+            fi

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.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 2024  Frédéric Gerber
+
+    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:
+
+    <program>  Copyright (C) 2024  Frédéric Gerber
+    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

@@ -8,8 +8,8 @@
   <img src="https://forthebadge.com/images/badges/built-for-android.svg" alt="Built for Android">
   <img src="https://forthebadge.com/images/badges/built-with-love.svg" alt="Built with love">
   <br>
-    <a href="https://github.com/choelzl/beans/actions/workflows/build.yml">
+    <a href="https://github.com/helcel-net/beans/actions/workflows/build.yml">
-    <img src="https://github.com/choelzl/beans/actions/workflows/build.yml/badge.svg?branch=main" alt="Build Status">
+    <img src="https://github.com/helcel-net/beans/actions/workflows/build.yml/badge.svg?branch=main" alt="Build Status">
   </a>
 </div>
 
@@ -18,9 +18,10 @@
 <div align="center">
   <table>
     <tr>
-      <td style="width: 33%; height: 100px;"><img src="./metadata/en-US/images/phoneScreenshots/launcher.jpg" alt="Launcher" style="width: 100%; height: 100%;"></td>
+      <td style="width: 33%; height: 100px;"><img src="./metadata/en-US/images/phoneScreenshots/screenshot01.png" alt="Map" style="width: 100%; height: 100%;"></td>
-      <td style="width: 33%; height: 100px;"><img src="./metadata/en-US/images/phoneScreenshots/view.jpg" alt="View" style="width: 100%; height: 100%;"></td>
+      <td style="width: 33%; height: 100px;"><img src="./metadata/en-US/images/phoneScreenshots/screenshot02.png" alt="Edit" style="width: 100%; height: 100%;"></td>
-      <td style="width: 33%; height: 100px;"><img src="./metadata/en-US/images/phoneScreenshots/edit.jpg" alt="Edit" style="width: 100%; height: 100%;"></td>
+      <td style="width: 33%; height: 100px;"><img src="./metadata/en-US/images/phoneScreenshots/screenshot03.png" alt="Statistics" style="width: 100%; height: 100%;"></td>
+      <td style="width: 33%; height: 100px;"><img src="./metadata/en-US/images/phoneScreenshots/screenshot04.png" alt="Settings" style="width: 100%; height: 100%;"></td>
     </tr>
   </table>
 </div>
@@ -30,17 +31,23 @@
 - Color a map of places based on custom labels
 - Country/State based coloring
 - Single/Multi color modes
+- Different map projections available
 - Small & Fast
 - Statistics (WIP)
+- 100% Free and Open Source software, with no proprietary dependencies
 
 ## 📳 Installation
 
 <div style="display: flex; justify-content: center; align-items: center; flex-direction: row;">
-    <a href="https://github.com/choelzl/beans/releases/latest">
+    <a href="https://f-droid.org/packages/net.helcel.beans/">
+        <img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" alt="Get it on F-Droid" width="206">
+    </a>
+    <a href="https://github.com/helcel-net/beans/releases/latest">
         <img width="200" height="84" alt="APK Download" src=".github/images/apk.png">
     </a>
 </div>
 
+
 ## ⚙️ Permissions
 
 None
@@ -61,7 +68,18 @@ Thanks to all contributors, the developers of our dependencies, and our users.
 ## 📝 License
 
 ```
-Copyright (C) 2024 Helcel
+Copyright (C) 2024 Helcel MYDOLI
 
-Licensed under ???
+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/>.
 ```

app/build.gradle

@@ -2,12 +2,9 @@ plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
     id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.23'
-    id 'com.mikepenz.aboutlibraries.plugin' version '11.1.1'
+    id 'com.mikepenz.aboutlibraries.plugin' version '11.1.3'
 }
 
-def keystorePropertiesFile = rootProject.file("app/keystore.properties")
-def keystoreProperties = new Properties()
-keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
 android {
     namespace 'net.helcel.beans'
@@ -18,24 +15,39 @@ android {
         minSdk 28
         targetSdk 34
         versionCode 1
-        versionName "0.1a"
+        versionName "1.0"
     }
-
     signingConfigs {
         create("release") {
+            try {
+                def keystorePropertiesFile = rootProject.file("app/keystore.properties")
+                def keystoreProperties = new Properties()
+                keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+
                 keyAlias keystoreProperties['keyAlias']
                 keyPassword keystoreProperties['keyPassword']
                 storeFile file(keystoreProperties['storeFile'])
                 storePassword keystoreProperties['storePassword']
+            } catch (FileNotFoundException e) {
+                println("File not found: ${e.message}")
+            }
         }
     }
 
 
     buildTypes {
+        debug {
+            debuggable true
+        }
         release {
             minifyEnabled true
             shrinkResources false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+        signedRelease {
+            minifyEnabled true
+            shrinkResources false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             signingConfig = signingConfigs.getByName("release")
         }
     }
@@ -75,6 +87,5 @@ dependencies {
 
     implementation 'com.caverock:androidsvg-aar:1.4'
     implementation 'com.github.chrisbanes:PhotoView:2.3.0'
-    implementation "com.github.AppDevNext:AndroidChart:3.1.0.21"
+    implementation 'com.mikepenz:aboutlibraries:11.1.3'
-    implementation 'com.mikepenz:aboutlibraries:11.1.1'
 }

app/src/main/AndroidManifest.xml

@@ -3,18 +3,18 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <application
-        android:hardwareAccelerated="false"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/ic_launcher"
+        android:hardwareAccelerated="false"
+        android:icon="@mipmap/ic_launcher_round"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/Theme.Beans"
-        tools:targetApi="31"
         tools:replace="android:allowBackup"
-        >
+        tools:targetApi="31">
         <profileable android:shell="true" />
+
         <activity
             android:name=".activity.MainActivity"
             android:exported="true">
@@ -31,7 +31,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".activity.StatActivity"
+            android:name=".activity.StatsActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/assets/geoloc_state.txt

@@ -32,7 +32,8 @@ AFG_TK|AFG|Takhar|12361
 AFG_OZ|AFG|Uruzgan|12900
 AFG_VR|AFG|Wardak|8945
 AFG_ZB|AFG|Zabul|17375
-XAD_NA|XAD|Dhekelia|125
+XAD_Akrotiri|XAD|Akrotiri|109
+XAD_Dhekelia|XAD|Dhekelia|125
 ALA_AR|ALA|Archipelago|448
 ALA_CO|ALA|Countryside|1022
 ALA_MH|ALA|Mariehamn|13
@@ -126,14 +127,17 @@ AGO_NA|AGO|Namibe|58240
 AGO_UI|AGO|Uíge|62425
 AGO_ZA|AGO|Zaire|36821
 AIA_BP|AIA|Blowing Point|5
-AIA_NA|AIA|Sombrero Island|0
+AIA_DogIsland|AIA|Dog Island|2
 AIA_EE|AIA|East End|5
 AIA_GH|AIA|George Hill|7
 AIA_IH|AIA|Island Harbour|6
 AIA_NH|AIA|North Hill|1
 AIA_NS|AIA|North Side|9
+AIA_PriclyPearCays|AIA|Pricly Pear Cays|0
 AIA_SG|AIA|Sandy Ground|1
 AIA_SH|AIA|Sandy Hill|7
+AIA_ScrubIsland|AIA|Scrub Island|4
+AIA_SombreroIsland|AIA|Sombrero Island|0
 AIA_SO|AIA|South Hill|7
 AIA_ST|AIA|Stoney Ground|7
 AIA_TF|AIA|The Farrington|5
@@ -203,8 +207,16 @@ AUT_ST|AUT|Steiermark|16408
 AUT_TR|AUT|Tirol|12646
 AUT_VO|AUT|Vorarlberg|2602
 AUT_WI|AUT|Wien|415
-AZE_NA|AZE|Yukhari-Karabakh|7407
+AZE_Absheron|AZE|Absheron|6147
+AZE_Aran|AZE|Aran|21914
+AZE_Daglig-Shirvan|AZE|Daglig-Shirvan|5989
+AZE_Ganja-Qazakh|AZE|Ganja-Qazakh|12044
+AZE_Kalbajar-Lachin|AZE|Kalbajar-Lachin|5770
 AZE_LA|AZE|Lankaran|5592
+AZE_Nakhchivan|AZE|Nakhchivan|5400
+AZE_Quba-Khachmaz|AZE|Quba-Khachmaz|7339
+AZE_Shaki-Zaqatala|AZE|Shaki-Zaqatala|8729
+AZE_Yukhari-Karabakh|AZE|Yukhari-Karabakh|7407
 BHS_AK|BHS|Acklins|496
 BHS_BR|BHS|Berry Islands|61
 BHS_BI|BHS|Biminis|34
@@ -266,7 +278,9 @@ BLR_HR|BLR|Grodno|24952
 BLR_MI|BLR|Minsk|2255
 BLR_MA|BLR|Mogilev|28984
 BLR_VI|BLR|Vitebsk|40056
-BEL_NA|BEL|Wallonie|16827
+BEL_Bruxelles|BEL|Bruxelles|156
+BEL_Vlaanderen|BEL|Vlaanderen|13685
+BEL_Wallonie|BEL|Wallonie|16827
 BLZ_BZ|BLZ|Belize|3372
 BLZ_CY|BLZ|Cayo|5322
 BLZ_CZ|BLZ|Corozal|2012
@@ -374,7 +388,11 @@ BRA_SC|BRA|Santa Catarina|96032
 BRA_SP|BRA|São Paulo|249417
 BRA_SE|BRA|Sergipe|22079
 BRA_TO|BRA|Tocantins|279170
-VGB_NA|VGB|Virgin Gorda|28
+VGB_Anegada|VGB|Anegada|40
+VGB_JostVanDyke|VGB|Jost Van Dyke|11
+VGB_OtherIslands|VGB|Other Islands|14
+VGB_Tortola|VGB|Tortola|76
+VGB_VirginGorda|VGB|Virgin Gorda|28
 BRN_BE|BRN|Belait|2863
 BRN_BM|BRN|Brunei and Muara|533
 BRN_TE|BRN|Temburong|1283
@@ -636,7 +654,17 @@ COL_VD|COL|Vichada|100014
 COM_MO|COM|Mwali|220
 COM_GC|COM|Njazídja|1028
 COM_AN|COM|Nzwani|436
-COK_NA|COK|Rarotonga|70
+COK_Aitutaki|COK|Aitutaki|28
+COK_Atiu|COK|Atiu|31
+COK_Mangaia|COK|Mangaia|49
+COK_Manihiki|COK|Manihiki|8
+COK_Mauke|COK|Mauke|20
+COK_Mitiaro|COK|Mitiaro|25
+COK_Palmerston|COK|Palmerston|24
+COK_Penhryn|COK|Penhryn|17
+COK_Pukapuka|COK|Pukapuka|6
+COK_Rakahanga|COK|Rakahanga|5
+COK_Rarotonga|COK|Rarotonga|70
 CRI_AL|CRI|Alajuela|9834
 CRI_CA|CRI|Cartago|3113
 CRI_GU|CRI|Guanacaste|10250
@@ -878,7 +906,7 @@ EST_JN|EST|Jõgeva|2597
 EST_LN|EST|Lääne|2420
 EST_LV|EST|Lääne-Viru|3478
 EST_PR|EST|Pärnu|4796
-EST_NA|EST|Peipsi|1758
+EST_Peipsi|EST|Peipsi|1758
 EST_PL|EST|Põlva|2161
 EST_RA|EST|Rapla|2971
 EST_SA|EST|Saare|2932
@@ -934,7 +962,7 @@ PYF_MI|PYF|Îles Marquises|996
 PYF_LI|PYF|Îles Sous-le-Vent|429
 PYF_TG|PYF|Îles Tuamotu-Gambier|1039
 ATF_CR|ATF|Îles Crozet|372
-ATF_NA|ATF|ÎlesÉparses|44
+ATF_ÎlesÉparses|ATF|Îles Éparses|44
 ATF_AS|ATF|Îles Saint Paulet Amsterdam|64
 ATF_KG|ATF|Kerguelen|7372
 GAB_ES|GAB|Estuaire|20024
@@ -1071,9 +1099,14 @@ GGY_SV|GGY|Saint Saviour|6
 GGY_SK|GGY|Sark|7
 GGY_TV|GGY|Torteval|3
 GGY_VA|GGY|Vale|10
-GIN_NA|GIN|Nzérékoré|36751
+GIN_Boké|GIN|Boké|34287
 GIN_C|GIN|Conakry|423
+GIN_Faranah|GIN|Faranah|35989
 GIN_K|GIN|Kankan|72197
+GIN_Kindia|GIN|Kindia|25816
+GIN_Labé|GIN|Labé|22959
+GIN_Mamou|GIN|Mamou|17935
+GIN_Nzérékoré|GIN|Nzérékoré|36751
 GNB_BA|GNB|Bafatá|5881
 GNB_BM|GNB|Biombo|761
 GNB_BS|GNB|Bissau|83
@@ -1298,7 +1331,7 @@ IMN_MC|IMN|Michael|34
 IMN_MD|IMN|Santon|16
 IMN_GR|IMN|Garff|72
 IMN_GB|IMN|Peel|2
-ISR_NA|ISR|Golan|1238
+ISR_Golan|ISR|Golan|1238
 ISR_HD|ISR|Ha Darom|14557
 ISR_HA|ISR|Haifa|887
 ISR_HM|ISR|Ha Merkaz|1243
@@ -1471,10 +1504,13 @@ KEN_UG|KEN|Uasin Gishu|3453
 KEN_VI|KEN|Vihiga|562
 KEN_WJ|KEN|Wajir|57017
 KEN_WP|KEN|West Pokot|9574
-XKO_NA|XKO|Uroševac|1056
+XKO_Đakovica|XKO|Đakovica|1109
+XKO_Gnjilane|XKO|Gnjilane|1360
 XKO_KM|XKO|Kosovska Mitrovica|2070
 XKO_PE|XKO|Pećki|1357
+XKO_Pristina|XKO|Pristina|2175
 XKO_PZ|XKO|Prizren|1715
+XKO_Uroševac|XKO|Uroševac|1056
 KWT_AH|KWT|Al Ahmadi|4659
 KWT_FA|KWT|Al Farwaniyah|219
 KWT_JA|KWT|Al Jahrah|12438
@@ -1512,7 +1548,14 @@ LVA_L|LVA|Latgale|14678
 LVA_R|LVA|Riga|10324
 LVA_V|LVA|Vidzeme|15240
 LVA_Z|LVA|Zemgale|10775
-LBN_NA|LBN|South|919
+LBN_Akkar|LBN|Akkar|793
+LBN_Baalbak-Hermel|LBN|Baalbak-Hermel|2854
+LBN_Beirut|LBN|Beirut|21
+LBN_Bekaa|LBN|Bekaa|1408
+LBN_MountLebanon|LBN|Mount Lebanon|1990
+LBN_Nabatiyeh|LBN|Nabatiyeh|1099
+LBN_North|LBN|North|1181
+LBN_South|LBN|South|919
 LSO_BE|LSO|Berea|1999
 LSO_BB|LSO|Butha-Buthe|1796
 LSO_LE|LSO|Leribe|2829
@@ -1624,7 +1667,7 @@ MKD_KZ|MKD|Kriva Palanka|508
 MKD_KG|MKD|Krivogaštani|95
 MKD_KS|MKD|Kruševo|183
 MKD_UM|MKD|Kumanovo|503
-MKD_NA|MKD|Staro Nagoričane|438
+MKD_LakeOhrid|MKD|Lake Ohrid|247
 MKD_LI|MKD|Lipkovo|265
 MKD_LO|MKD|Lozovo|161
 MKD_MK|MKD|Makedonska Kamenica|198
@@ -1647,6 +1690,7 @@ MKD_RM|MKD|Rosoman|133
 MKD_AJ|MKD|Saraj|234
 MKD_SS|MKD|Sopište|214
 MKD_SD|MKD|Star Dojran|150
+MKD_NA|MKD|Staro Nagoričane|438
 MKD_ST|MKD|Štip|565
 MKD_UG|MKD|Struga|475
 MKD_RU|MKD|Strumitsa|320
@@ -1669,7 +1713,7 @@ MDG_D|MDG|Antsiranana|44120
 MDG_F|MDG|Fianarantsoa|101276
 MDG_M|MDG|Mahajanga|152526
 MDG_A|MDG|Toamasina|71636
-MDG_NA|MDG|Toliary|164809
+MDG_Toliary|MDG|Toliary|164809
 MWI_BA|MWI|Balaka|2143
 MWI_BL|MWI|Blantyre|2038
 MWI_CK|MWI|Chikwawa|4908
@@ -1728,9 +1772,29 @@ MLT_GO|MLT|Għawdex|71
 MLT_SO|MLT|Nofsinhar|78
 MLT_NO|MLT|Tramuntana|116
 MLT_SE|MLT|Xlokk|36
-MHL_NA|MHL|NA|26
+MHL_Ailinglaplap|MHL|Ailinglaplap|18
+MHL_Ailuk|MHL|Ailuk|11
+MHL_Arno|MHL|Arno|28
+MHL_Aur|MHL|Aur|6
+MHL_Ebon|MHL|Ebon|8
+MHL_Enewetok|MHL|Enewetok|16
+MHL_Jabat|MHL|Jabat|1
+MHL_Jaluit|MHL|Jaluit|13
 MHL_KWA|MHL|Kwajalein|27
+MHL_Lae|MHL|Lae|3
+MHL_Lib|MHL|Lib|1
+MHL_Likiep|MHL|Likiep|13
 MHL_MAJ|MHL|Majuro|22
+MHL_Maloelap|MHL|Maloelap|12
+MHL_Mejit|MHL|Mejit|4
+MHL_Mili|MHL|Mili|27
+MHL_Namorik|MHL|Namorik|5
+MHL_Namu|MHL|Namu|7
+MHL_Ujae|MHL|Ujae|3
+MHL_Utirik|MHL|Utirik|14
+MHL_Wotho|MHL|Wotho|6
+MHL_Wotje|MHL|Wotje|15
+MHL_19_1|MHL|NA|26
 MTQ_FF|MTQ|Fort-de-France|189
 MTQ_MA|MTQ|Le Marin|393
 MTQ_TR|MTQ|Le Trinité|353
@@ -1896,7 +1960,7 @@ MAR_FB|MAR|Fès-Boulemane|19366
 MAR_GB|MAR|Gharb-Chrarda-Béni Hssen|8782
 MAR_GC|MAR|Grand Casablanca|879
 MAR_GE|MAR|Guelmim-Es-Semara|64701
-MAR_LB|MAR|Laâyoune-Boujdour-Sakia El H|5763
+MAR_LB|MAR|Laâyoune-Boujdour-Sakia El Hamra|5763
 MAR_MK|MAR|Marrakech-Tensift-Al Haouz|32483
 MAR_MT|MAR|Meknès-Tafilalet|60303
 MAR_OR|MAR|Oriental|59914
@@ -1968,13 +2032,15 @@ NLD_FL|NLD|Flevoland|1466
 NLD_FR|NLD|Fryslân|3573
 NLD_GE|NLD|Gelderland|5102
 NLD_GR|NLD|Groningen|2370
-NLD_SH|NLD|Zuid-Holland|3143
+NLD_IJsselmeer|NLD|IJsselmeer|1995
 NLD_LI|NLD|Limburg|2159
 NLD_NB|NLD|Noord-Brabant|5082
 NLD_NH|NLD|Noord-Holland|2872
 NLD_OV|NLD|Overijssel|3369
 NLD_UT|NLD|Utrecht|1555
 NLD_ZE|NLD|Zeeland|1804
+NLD_Zeeuwsemeren|NLD|Zeeuwsemeren|477
+NLD_14_1|NLD|NA|3143
 NCL_IL|NCL|Îles Loyauté|1988
 NCL_NO|NCL|Nord|9520
 NCL_SU|NCL|Sud|7408
@@ -2067,13 +2133,18 @@ PRK_WB|PRK|Hwanghae-bukto|8248
 PRK_WN|PRK|Hwanghae-namdo|8563
 PRK_KS|PRK|Kaesŏng|1182
 PRK_KW|PRK|Kangwŏn-do|10286
-PRK_NA|PRK|Sinŭiju|109
+PRK_Kumgangsan|PRK|Kumgangsan|987
 PRK_PB|PRK|P'yŏngan-bukto|12424
 PRK_PN|PRK|P'yŏngan-namdo|12479
 PRK_PY|PRK|P'yŏngyang|2718
 PRK_NJ|PRK|Rasŏn|856
 PRK_YG|PRK|Ryanggang|13935
-ZNC_NA|ZNC|Nicosia|522
+PRK_Sinŭiju|PRK|Sinŭiju|109
+ZNC_Gazimağusa|ZNC|Gazimağusa|927
+ZNC_Girne|ZNC|Girne|677
+ZNC_Güzelyurt|ZNC|Güzelyurt|346
+ZNC_Iskele|ZNC|Iskele|849
+ZNC_Nicosia|ZNC|Nicosia|522
 MNP_NI|MNP|Northern Islands|181
 MNP_RO|MNP|Rota|90
 MNP_SA|MNP|Saipan|123
@@ -2318,7 +2389,7 @@ PRT_FA|PRT|Faro|4975
 PRT_GU|PRT|Guarda|5541
 PRT_LE|PRT|Leiria|3501
 PRT_LI|PRT|Lisboa|2765
-PRT_NA|PRT|Madeira|801
+PRT_Madeira|PRT|Madeira|801
 PRT_PA|PRT|Portalegre|6091
 PRT_PO|PRT|Porto|2332
 PRT_SA|PRT|Santarém|6725
@@ -2511,7 +2582,7 @@ RUS_LP|RUS|Lipetsk|24425
 RUS_MG|RUS|Magadan|459480
 RUS_ME|RUS|Mariy-El|23468
 RUS_MR|RUS|Mordovia|26161
-RUS_NA|RUS|Moscow City|1095
+RUS_MoscowCity|RUS|Moscow City|1095
 RUS_MS|RUS|Moskva|46592
 RUS_MM|RUS|Murmansk|142851
 RUS_NN|RUS|Nenets|175502
@@ -2557,7 +2628,8 @@ RWA_SU|RWA|Amajyepfo|5997
 RWA_ES|RWA|Iburasirazuba|9530
 RWA_OU|RWA|Iburengerazuba|5910
 RWA_KV|RWA|Umujyiwa Kigali|733
-BLM_NA|BLM|Sousle Vent|8
+BLM_AuVent|BLM|Au Vent|13
+BLM_SousleVent|BLM|Sous le Vent|8
 SHN_AC|SHN|Ascension|100
 SHN_SH|SHN|Saint Helena|124
 SHN_TA|SHN|Tristanda Cunha|189
@@ -2697,7 +2769,11 @@ SLE_EA|SLE|Eastern|15846
 SLE_NO|SLE|Northern|36238
 SLE_SO|SLE|Southern|20261
 SLE_WE|SLE|Western|722
-SGP_NA|SGP|West|230
+SGP_Central|SGP|Central|133
+SGP_East|SGP|East|103
+SGP_North|SGP|North|131
+SGP_North-East|SGP|North-East|103
+SGP_West|SGP|West|230
 SVK_BC|SVK|Banskobystrický|9565
 SVK_BL|SVK|Bratislavský|2015
 SVK_KI|SVK|Košický|6768
@@ -2708,7 +2784,7 @@ SVK_TA|SVK|Trnavský|4125
 SVK_ZI|SVK|Žilinský|6828
 SVN_GO|SVN|Gorenjska|2117
 SVN_SP|SVN|Goriška|2277
-SVN_NA|SVN|Jugovzhodna Slovenija|2635
+SVN_JugovzhodnaSlovenija|SVN|Jugovzhodna Slovenija|2635
 SVN_KO|SVN|Koroška|1032
 SVN_NO|SVN|Notranjsko-kraška|1452
 SVN_JP|SVN|Obalno-kraška|945
@@ -3191,7 +3267,12 @@ TKM_BA|TKM|Balkan|136605
 TKM_DA|TKM|Daşoguz|76751
 TKM_LE|TKM|Lebap|96478
 TKM_MA|TKM|Mary|86353
-TCA_NA|TCA|South Caicosand East Caicos|247
+TCA_GrandTurk|TCA|Grand Turk|20
+TCA_MiddleCaicos|TCA|Middle Caicos|306
+TCA_NorthCaicos|TCA|North Caicos|259
+TCA_ProvidencialesandWestCaicos|TCA|Providenciales and West Caicos|152
+TCA_SaltCay|TCA|Salt Cay|11
+TCA_SouthCaicosandEastCaicos|TCA|South Caicos and East Caicos|247
 TUV_FN|TUV|Funafuti|7
 TUV_NG|TUV|Nanumanga|3
 TUV_NA|TUV|Nanumea|4
@@ -3231,7 +3312,8 @@ UGA_TG|UGA|Kitgum|9621
 UGA_KF|UGA|Kotido|13366
 UGA_KU|UGA|Kumi|2867
 UGA_KJ|UGA|Kyenjojo|4125
-UGA_NA|UGA|Nakasongola|3536
+UGA_LakeAlbert|UGA|Lake Albert|3212
+UGA_LakeVictoria|UGA|Lake Victoria|28585
 UGA_LA|UGA|Lira|7285
 UGA_LW|UGA|Luwero|5734
 UGA_MA|UGA|Masaka|3643
@@ -3245,6 +3327,7 @@ UGA_MI|UGA|Mpigi|3321
 UGA_MD|UGA|Mubende|6242
 UGA_MN|UGA|Mukono|3434
 UGA_NP|UGA|Nakapiripirit|5859
+UGA_NA|UGA|Nakasongola|3536
 UGA_NE|UGA|Nebbi|2910
 UGA_NT|UGA|Ntungamo|2068
 UGA_PD|UGA|Pader|6905
@@ -3295,7 +3378,7 @@ ARE_UQ|ARE|Ummal-Qaywayn|746
 GBR_NIR|GBR|Northern Ireland|14134
 GBR_SCT|GBR|Scotland|78704
 GBR_WLS|GBR|Wales|20818
-GBR_NA|GBR|NA|130659
+GBR_1_1|GBR|England|130659
 USA_AL|USA|Alabama|133995
 USA_AK|USA|Alaska|1501231
 USA_AZ|USA|Arizona|296082
@@ -3347,7 +3430,15 @@ USA_WA|USA|Washington|174789
 USA_WV|USA|West Virginia|62782
 USA_WI|USA|Wisconsin|169315
 USA_WY|USA|Wyoming|253420
-UMI_NA|UMI|Wake|9
+UMI_Baker|UMI|Baker|2
+UMI_Howland|UMI|Howland|2
+UMI_Jarvisisland|UMI|Jarvis island|5
+UMI_Johnston|UMI|Johnston|5
+UMI_KingmanReef|UMI|Kingman Reef|3
+UMI_Midway|UMI|Midway|12
+UMI_Navassa|UMI|Navassa|5
+UMI_Palmyra|UMI|Palmyra|4
+UMI_Wake|UMI|Wake|9
 URY_AR|URY|Artigas|12058
 URY_CA|URY|Canelones|4536
 URY_CL|URY|Cerro Largo|13843
@@ -3388,22 +3479,28 @@ VUT_SE|VUT|Shefa|1522
 VUT_TF|VUT|Tafea|1666
 VUT_TR|VUT|Torba|889
 VEN_Z|VEN|Amazonas|184052
-VEN_NA|VEN|Vargas|1002
+VEN_Anzoátegui|VEN|Anzoátegui|48025
 VEN_C|VEN|Apure|74003
 VEN_D|VEN|Aragua|6977
 VEN_E|VEN|Barinas|36436
+VEN_Bolívar|VEN|Bolívar|241518
 VEN_G|VEN|Carabobo|4812
 VEN_H|VEN|Cojedes|14572
 VEN_Y|VEN|Delta Amacuro|40278
 VEN_DP|VEN|Dependencias Federales|343
 VEN_A|VEN|Distrito Capital|329
+VEN_Falcón|VEN|Falcón|27275
+VEN_Guárico|VEN|Guárico|67685
 VEN_K|VEN|Lara|19166
+VEN_Mérida|VEN|Mérida|12914
 VEN_M|VEN|Miranda|8623
 VEN_N|VEN|Monagas|29251
 VEN_O|VEN|Nueva Esparta|1039
 VEN_P|VEN|Portuguesa|19622
 VEN_R|VEN|Sucre|10950
+VEN_Táchira|VEN|Táchira|10851
 VEN_T|VEN|Trujillo|8129
+VEN_Vargas|VEN|Vargas|1002
 VEN_U|VEN|Yaracuy|6259
 VEN_V|VEN|Zulia|44191
 VNM_AG|VNM|An Giang|3547
@@ -3532,4 +3629,3 @@ Z05_UT|IND|Uttarakhand|259
 Z09_UT|IND|Uttarakhand|987
 Z06_JK|PAK|Azad Kashmir|13931
 Z06_NA|PAK|Gilgit-Baltistan|68053
-GBR_EN|GBR|England|417

app/src/main/java/net/helcel/beans/activity/EditActivity.kt

@@ -1,15 +1,22 @@
 package net.helcel.beans.activity
 
 import android.os.Bundle
+import android.view.Menu
 import android.view.MenuItem
 import androidx.activity.addCallback
 import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
 import com.google.android.material.tabs.TabLayoutMediator
 import net.helcel.beans.R
 import net.helcel.beans.activity.adapter.ViewPagerAdapter
+import net.helcel.beans.activity.fragment.EditGroupAddFragment
+import net.helcel.beans.activity.fragment.EditPlaceColorFragment
 import net.helcel.beans.activity.fragment.EditPlaceFragment
 import net.helcel.beans.countries.World
 import net.helcel.beans.databinding.ActivityEditBinding
+import net.helcel.beans.helper.Data
+import net.helcel.beans.helper.DialogCloser
+import net.helcel.beans.helper.Settings
 import net.helcel.beans.helper.Theme.createActionBar
 
 
@@ -39,8 +46,24 @@ class EditActivity : AppCompatActivity() {
         }
     }
 
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        if (Settings.isSingleGroup(this)) {
+            menuInflater.inflate(R.menu.menu_edit, menu)
+        }
+        return true
+    }
+
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        finish()
+        when (item.itemId) {
+            R.id.action_color -> {
+                Data.groups.getUniqueEntry()?.let { group ->
+                    EditGroupAddFragment(group.key, {
+                        (_binding.pager.adapter as ViewPagerAdapter?)?.refreshColors(group.color)
+                    }, {}, false).show(supportFragmentManager, "AddColorDialogFragment")
+                }
+            }
+            else -> finish()
+        }
         return super.onOptionsItemSelected(item)
     }
 

app/src/main/java/net/helcel/beans/activity/MainActivity.kt

@@ -24,6 +24,7 @@ class MainActivity : AppCompatActivity() {
     private lateinit var css: CSSWrapper
 
     override fun onRestart() {
+        refreshProjection()
         refreshMap()
         super.onRestart()
     }
@@ -36,7 +37,7 @@ class MainActivity : AppCompatActivity() {
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         val d = when (item.itemId) {
             R.id.action_edit -> EditActivity::class.java
-            R.id.action_stats -> StatActivity::class.java
+            R.id.action_stats -> StatsActivity::class.java
             R.id.action_settings -> SettingsActivity::class.java
             else -> throw Exception("Non Existent Menu Item")
         }
@@ -48,8 +49,6 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         _binding = ActivityMainBinding.inflate(layoutInflater)
         Settings.start(this)
-        supportActionBar?.setBackgroundDrawable(colorWrapper(this, android.R.attr.colorPrimary))
-
 
         setContentView(_binding.root)
 
@@ -58,9 +57,8 @@ class MainActivity : AppCompatActivity() {
 
         GeoLocImporter.importStates(this)
         Data.loadData(this, Int.MIN_VALUE)
-        psvg = SVGWrapper(this)
-        css = CSSWrapper(this)
 
+        refreshProjection()
         refreshMap()
     }
 
@@ -70,4 +68,9 @@ class MainActivity : AppCompatActivity() {
         _binding.photoView.setImageDrawable(PictureDrawable(psvg.get()?.renderToPicture(opt)))
     }
 
+    fun refreshProjection() {
+        psvg = SVGWrapper(this)
+        css = CSSWrapper(this)
+    }
+
 }

app/src/main/java/net/helcel/beans/activity/StatActivity.kt

@@ -1,104 +0,0 @@
-package net.helcel.beans.activity
-
-import android.graphics.Color
-import android.os.Bundle
-import android.util.Log
-import android.view.MenuItem
-import androidx.appcompat.app.AppCompatActivity
-import com.github.mikephil.charting.charts.PieChart
-import com.github.mikephil.charting.data.PieData
-import com.github.mikephil.charting.data.PieDataSet
-import com.github.mikephil.charting.data.PieEntry
-import com.github.mikephil.charting.formatter.PercentFormatter
-import com.github.mikephil.charting.utils.MPPointF
-import net.helcel.beans.R
-import net.helcel.beans.countries.World
-import net.helcel.beans.helper.Data.groups
-import net.helcel.beans.helper.Data.visits
-import net.helcel.beans.helper.Theme.colorWrapper
-import net.helcel.beans.helper.Theme.createActionBar
-
-
-class StatActivity : AppCompatActivity() {
-
-    private lateinit var chart: PieChart
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        setContentView(R.layout.activity_stat)
-        createActionBar(this, getString(R.string.action_stat))
-
-
-        chart = findViewById(R.id.chart)
-        chart.setUsePercentValues(true)
-        chart.description.isEnabled = false
-        chart.setExtraOffsets(5F, 10F, 5F, 5F)
-
-        chart.centerText = "Country Area"
-
-        chart.setDrawCenterText(true)
-        chart.isDrawHoleEnabled = true
-        chart.setTransparentCircleColor(Color.TRANSPARENT)
-        chart.setHoleColor(Color.TRANSPARENT)
-        chart.setCenterTextColor(colorWrapper(this, android.R.attr.colorForeground).color)
-        chart.setTransparentCircleAlpha(0)
-        chart.holeRadius = 40F
-        chart.transparentCircleRadius = 40F
-        chart.rotationAngle = 0F
-        chart.isRotationEnabled = false
-        chart.isHighlightPerTapEnabled = false
-
-        chart.legend.isEnabled = false
-
-        bind()
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        finish()
-        return super.onOptionsItemSelected(item)
-    }
-
-
-    private fun bind() {
-        val entries = ArrayList<PieEntry>()
-        val VIS_continents = World.WWW.children.groupBy { visits.getVisited(it) }
-            .map { Pair(it.key, it.value.map { c -> c.area }.fold(0) { acc, i -> acc + i }) }
-        val VIS_country =
-            World.WWW.children.map { it.children }.flatten().groupBy { visits.getVisited(it) }
-                .map { Pair(it.key, it.value.map { c -> c.area }.fold(0) { acc, i -> acc + i }) }
-        val vis = VIS_country
-        Log.d("VIS", vis.toString())
-        val max = vis.map { it.second }.fold(0) { acc, i -> acc + i }
-        vis.forEach {
-            entries.add(
-                PieEntry(
-                    it.second.toFloat().div(max.toFloat()),
-                    groups.getGroupFromKey(it.first).name
-                )
-            )
-        }
-        val dataSet = PieDataSet(entries, "GG1")
-
-        dataSet.valueTextColor = Color.BLACK
-        dataSet.sliceSpace = 3f
-        dataSet.iconsOffset = MPPointF(0f, 40f)
-        dataSet.selectionShift = 5f
-
-
-        dataSet.setDrawIcons(true)
-        dataSet.colors = vis.map { groups.getGroupFromKey(it.first).color.color }.toList()
-
-        val data = PieData(dataSet)
-        data.setDrawValues(false)
-        data.setValueFormatter(PercentFormatter())
-        data.setValueTextSize(11f)
-        data.setValueTextColor(Color.BLACK)
-        chart.setEntryLabelColor(Color.BLACK)
-        chart.data = data
-        chart.highlightValues(null)
-        chart.invalidate()
-    }
-
-
-}

app/src/main/java/net/helcel/beans/activity/StatsActivity.kt

@@ -0,0 +1,57 @@
+package net.helcel.beans.activity
+
+import android.os.Bundle
+import android.view.MenuItem
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import androidx.viewpager2.widget.ViewPager2
+import com.google.android.material.tabs.TabLayoutMediator
+import net.helcel.beans.R
+import net.helcel.beans.activity.adapter.StatsListAdapter
+import net.helcel.beans.countries.GeoLoc.LocType
+import net.helcel.beans.databinding.ActivityStatBinding
+import net.helcel.beans.helper.Settings
+import net.helcel.beans.helper.Theme.createActionBar
+
+private val MODE_LIST = listOf(LocType.WORLD, LocType.COUNTRY, LocType.STATE)
+
+class StatsActivity : AppCompatActivity() {
+    private lateinit var _binding: ActivityStatBinding
+    private var activeMode = LocType.WORLD
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        _binding = ActivityStatBinding.inflate(layoutInflater)
+        setContentView(_binding.root)
+        createActionBar(this, getString(R.string.action_stat))
+
+        _binding.stats.layoutManager =
+            LinearLayoutManager(this, RecyclerView.VERTICAL, false)
+        val adapter = StatsListAdapter(_binding.stats, _binding.name)
+        _binding.groupColor.setOnClickListener { adapter.invertCountMode() }
+        _binding.stats.adapter = adapter
+
+        _binding.pager.adapter = object : FragmentStateAdapter(supportFragmentManager, lifecycle) {
+            override fun getItemCount(): Int = if (Settings.isRegional(applicationContext)) 3 else 2
+            override fun createFragment(position: Int): Fragment = Fragment()
+        }
+        TabLayoutMediator(_binding.tab, _binding.pager) { tab, position ->
+            tab.text = MODE_LIST[position].txt
+        }.attach()
+
+        _binding.pager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
+            override fun onPageSelected(position: Int) {
+                activeMode = MODE_LIST[position]
+                adapter.refreshMode(activeMode)
+            }
+        })
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        finish()
+        return super.onOptionsItemSelected(item)
+    }
+}

app/src/main/java/net/helcel/beans/activity/adapter/GeolocListAdapter.kt

@@ -3,39 +3,44 @@ package net.helcel.beans.activity.adapter
 import android.content.res.ColorStateList
 import android.graphics.Color
 import android.graphics.Typeface
+import android.graphics.drawable.ColorDrawable
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.checkbox.MaterialCheckBox
-import net.helcel.beans.R
 import net.helcel.beans.activity.fragment.EditPlaceColorFragment
 import net.helcel.beans.activity.fragment.EditPlaceFragment
 import net.helcel.beans.countries.GeoLoc
 import net.helcel.beans.databinding.ItemListGeolocBinding
-import net.helcel.beans.helper.Data
+import net.helcel.beans.helper.*
-import net.helcel.beans.helper.Settings
 import net.helcel.beans.helper.Theme.colorWrapper
 
 class GeolocListAdapter(
-    private val ctx: EditPlaceFragment, private val l: GeoLoc, private val pager: ViewPagerAdapter
+    private val ctx: EditPlaceFragment, private val l: GeoLoc, private val pager: ViewPagerAdapter,
+    private val parentHolder: FoldingListViewHolder?
 ) : RecyclerView.Adapter<GeolocListAdapter.FoldingListViewHolder>() {
 
+    private val sortedList = l.children.toList().sortedBy { it.fullName }
+    private val holders: MutableSet<FoldingListViewHolder> = mutableSetOf()
+
     override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): FoldingListViewHolder {
         val binding = ItemListGeolocBinding.inflate(
             LayoutInflater.from(viewGroup.context),
             viewGroup,
             false
         )
-        return FoldingListViewHolder(ctx.requireActivity(), binding)
+        val holder = FoldingListViewHolder(ctx.requireActivity(), binding, parentHolder, l)
+        holders.add(holder)
+        return holder
     }
 
     override fun onBindViewHolder(holder: FoldingListViewHolder, position: Int) {
-        val el = l.children[position]
+        val el = sortedList[position]
         holder.bind(el)
         holder.addListeners(el) {
             if (el.children.isNotEmpty())
-                pager.addFragment(ctx, EditPlaceFragment(el, pager))
+                pager.addFragment(ctx, EditPlaceFragment(el, pager, holder))
             true
         }
     }
@@ -44,23 +49,20 @@ class GeolocListAdapter(
         return l.children.size
     }
 
+    fun refreshColors(colorDrawable: ColorDrawable) {
+        holders.forEach { it.refreshColor(colorDrawable) }
+    }
+
     class FoldingListViewHolder(
         private val ctx: FragmentActivity,
-        private val _binding: ItemListGeolocBinding
+        private val _binding: ItemListGeolocBinding,
-    ) : RecyclerView.ViewHolder(_binding.root) {
+        private val _parentHolder: FoldingListViewHolder? = null,
+        private val _parentGeoLoc: GeoLoc,
+    ) : RecyclerView.ViewHolder(_binding.root), DialogCloser {
+        private lateinit var el: GeoLoc
 
         private fun bindGroup(el: GeoLoc) {
-            val numerator = el.children.map { Data.visits.getVisited(it) != 0 }.count { it }
+            refreshCount(el)
-            val denominator = el.children.size
-
-            _binding.count.text = when (Settings.getStatPref(ctx)) {
-                ctx.getString(R.string.percentages) -> ctx.getString(
-                    R.string.percentage,
-                    (100 * (numerator.toFloat() / denominator.toFloat())).toInt()
-                )
-
-                else -> ctx.getString(R.string.rate, numerator, denominator)
-            }
             _binding.textView.setTypeface(null, Typeface.BOLD)
             _binding.textView.backgroundTintList = ColorStateList.valueOf(
                 colorWrapper(
@@ -71,18 +73,27 @@ class GeolocListAdapter(
         }
 
         fun bind(el: GeoLoc) {
+            this.el = el
             _binding.textView.text = el.fullName
             _binding.textView.backgroundTintList =
                 ColorStateList.valueOf(colorWrapper(ctx, android.R.attr.colorBackground).color)
 
-            if (el.shouldShowChildren(ctx))
+            if (el.children.isNotEmpty())
                 bindGroup(el)
 
             refreshCheck(el)
         }
 
+        fun refreshColor(colorDrawable: ColorDrawable) {
+            if (Data.visits.getVisited(el) !in listOf(NO_GROUP, AUTO_GROUP)) {
+                _binding.checkBox.buttonTintList =
+                    ColorStateList.valueOf(colorDrawable.color)
+                refreshCheck(el)
+            }
+        }
+
         fun addListeners(el: GeoLoc, expandLambda: () -> Boolean) {
-            if (el.shouldShowChildren(ctx)) {
+            if (el.children.isNotEmpty()) {
                 _binding.textView.setOnClickListener { expandLambda() }
             }
             _binding.checkBox.setOnClickListener {
@@ -91,11 +102,11 @@ class GeolocListAdapter(
                     if (_binding.checkBox.isChecked) {
                         // If one has just checked the box (assign unique group)
                         Data.selected_group = Data.groups.getUniqueEntry()
-                        onColorDialogDismiss(false)
+                        onDialogDismiss(false)
                     } else {
                         // If one has just unchecked the box (unassign unique group)
                         Data.selected_group = null
-                        onColorDialogDismiss(true)
+                        onDialogDismiss(true)
                     }
                 } else {
                     Data.selected_group = null
@@ -104,39 +115,79 @@ class GeolocListAdapter(
                         "AddColorDialogFragment"
                     )
                 }
+                _parentHolder?.refresh(_parentGeoLoc)
             }
         }
 
-        fun onColorDialogDismiss(clear: Boolean) {
+        override fun onDialogDismiss(clear: Boolean) {
             if (clear) {
-                Data.visits.setVisited(Data.selected_geoloc, 0)
+                Data.visits.setVisited(Data.selected_geoloc, NO_GROUP)
                 Data.saveData()
+
+                if (_parentGeoLoc.children.all { Data.visits.getVisited(it) == NO_GROUP }) {
+                    Data.clearing_geoloc = _parentGeoLoc
+                }
             }
             if (Data.selected_group != null && Data.selected_geoloc != null) {
-                Data.visits.setVisited(Data.selected_geoloc, Data.selected_group?.key ?: 0)
+                Data.visits.setVisited(Data.selected_geoloc, Data.selected_group?.key ?: NO_GROUP)
                 Data.saveData()
             }
             Data.selected_geoloc?.let { refreshCheck(it) }
             Data.selected_geoloc = null
             Data.selected_group = null
+            _parentHolder?.refresh(_parentGeoLoc)
         }
 
         private fun refreshCheck(geoLoc: GeoLoc) {
+            _binding.checkBox.checkedState =
+                if (Data.visits.getVisited(geoLoc) !in listOf(NO_GROUP, AUTO_GROUP)) {
+                    MaterialCheckBox.STATE_CHECKED
+                } else if (geoLoc.children.isNotEmpty() &&
+                    geoLoc.children.all {
+                        Data.visits.getVisited(it) !in listOf(NO_GROUP, AUTO_GROUP)
+                    }
+                ) {
+                    Data.visits.setVisited(geoLoc, AUTO_GROUP)
+                    MaterialCheckBox.STATE_CHECKED
+                } else if (geoLoc.children.isEmpty() && Data.visits.getVisited(geoLoc) == AUTO_GROUP) {
+                    MaterialCheckBox.STATE_CHECKED
+                } else if (geoLoc.children.any { Data.visits.getVisited(it) != NO_GROUP }) {
+                    Data.visits.setVisited(geoLoc, AUTO_GROUP)
+                    MaterialCheckBox.STATE_INDETERMINATE
+                } else {
+                    Data.visits.setVisited(geoLoc, NO_GROUP)
+                    if (Data.clearing_geoloc == geoLoc) {
+                        Data.clearing_geoloc = null
+                    }
+                    MaterialCheckBox.STATE_UNCHECKED
+                }
+            Data.saveData()
+
             var col = Data.groups.getGroupFromKey(Data.visits.getVisited(geoLoc)).color
-            if (col.color == Color.TRANSPARENT) {
+            if (Data.visits.getVisited(geoLoc) == AUTO_GROUP) {
-                col = colorWrapper(
+                col = colorWrapper(ctx, android.R.attr.colorPrimary)
-                    ctx,
+            } else if (col.color == Color.TRANSPARENT) {
-                    android.R.attr.panelColorBackground
+                col = colorWrapper(ctx, android.R.attr.panelColorBackground)
-                )
                 col.alpha = 64
             }
-            _binding.checkBox.checkedState =
-                if (Data.visits.getVisited(geoLoc) != 0) MaterialCheckBox.STATE_CHECKED
-                else if (geoLoc.children.any { Data.visits.getVisited(it) != 0 }) MaterialCheckBox.STATE_INDETERMINATE
-                else MaterialCheckBox.STATE_UNCHECKED
-
             _binding.checkBox.buttonTintList = ColorStateList.valueOf(col.color)
         }
 
+        private fun refreshCount(geoLoc: GeoLoc) {
+            val numerator =
+                geoLoc.children.map { Data.visits.getVisited(it) != NO_GROUP }.count { it }
+            val denominator = geoLoc.children.size
+            _binding.count.text = Settings.getStats(ctx, numerator, denominator)
+        }
+
+        private fun refresh(geoLoc: GeoLoc) {
+            // Refresh
+            refreshCheck(geoLoc)
+            refreshCount(geoLoc)
+
+            // Recursively refresh parent
+            _parentHolder?.refresh(_parentGeoLoc)
+        }
+
     }
 }

app/src/main/java/net/helcel/beans/activity/adapter/GroupListAdapter.kt

@@ -13,7 +13,8 @@ import net.helcel.beans.helper.Theme.getContrastColor
 
 class GroupListAdapter(
     private val activity: FragmentActivity,
-    private val selectDialog: DialogFragment
+    private val selectDialog: DialogFragment,
+    private val delete: Boolean = false
 ) : RecyclerView.Adapter<GroupListAdapter.GroupViewHolder>() {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): GroupViewHolder {
@@ -63,6 +64,7 @@ class GroupListAdapter(
                 Data.selected_group = entry.second
                 selectDialog.dismiss()
             }
+            if (!delete) {
                 _binding.groupColor.setOnLongClickListener {
                     dialogFragment.show(
                         activity.supportFragmentManager,
@@ -73,3 +75,4 @@ class GroupListAdapter(
             }
         }
     }
+}

app/src/main/java/net/helcel/beans/activity/adapter/StatsListAdapter.kt

@@ -0,0 +1,152 @@
+package net.helcel.beans.activity.adapter
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.textview.MaterialTextView
+import net.helcel.beans.R
+import net.helcel.beans.countries.GeoLoc
+import net.helcel.beans.countries.GeoLoc.LocType
+import net.helcel.beans.countries.World
+import net.helcel.beans.databinding.ItemListGroupBinding
+import net.helcel.beans.helper.AUTO_GROUP
+import net.helcel.beans.helper.Data
+import net.helcel.beans.helper.Groups
+import net.helcel.beans.helper.Settings
+import net.helcel.beans.helper.Theme.getContrastColor
+
+class StatsListAdapter(private val stats: RecyclerView, private val total: MaterialTextView) :
+    RecyclerView.Adapter<StatsListAdapter.StatsViewHolder>() {
+    private val unit = "km²"
+
+    private var locMode = LocType.WORLD
+    private lateinit var ctx: Context
+    private var countMode: Boolean = true
+    private var initialSum: Int = 0
+
+    private val wwwTotal: List<GeoLoc> = World.WWW.children.toList()
+    private val countryTotal: List<GeoLoc> = World.WWW.children.flatMap { it.children }
+    private val stateTotal: List<GeoLoc> =
+        World.WWW.children.flatMap { it.children.flatMap { itt -> itt.children } }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): StatsViewHolder {
+        ctx = parent.context
+        val binding =
+            ItemListGroupBinding.inflate(LayoutInflater.from(ctx), parent, false)
+
+        return StatsViewHolder(binding)
+    }
+
+    override fun onBindViewHolder(holder: StatsViewHolder, pos: Int) {
+        initialSum += if (pos == itemCount - 1) {
+            holder.bind(
+                Pair(
+                    AUTO_GROUP,
+                    Groups.Group(AUTO_GROUP, ctx.getString(R.string.uncategorized))
+                )
+            )
+        } else {
+            holder.bind(Data.groups.getGroupFromPos(pos))
+        }
+        val unitNow = if (!countMode) unit else ""
+        total.text = Settings.getStats(ctx, initialSum, getTotal(), unitNow)
+    }
+
+    override fun getItemCount(): Int {
+        return Data.groups.size() + 1
+    }
+
+    private fun getTotal(): Int {
+        return if (countMode) {
+            when (locMode) {
+                LocType.WORLD -> wwwTotal.size
+                LocType.COUNTRY -> countryTotal.size
+                LocType.STATE -> stateTotal.size
+                else -> 0
+            }
+        } else {
+            when (locMode) {
+                LocType.WORLD -> wwwTotal.sumOf { it.area }
+                LocType.COUNTRY -> countryTotal.sumOf { it.area }
+                LocType.STATE -> stateTotal.sumOf { it.area }
+                else -> 0
+            }
+        }
+    }
+
+    fun refreshMode(mode: LocType) {
+        val sum = (0 until itemCount).map {
+            val viewHolder = stats.findViewHolderForAdapterPosition(it) as? StatsViewHolder
+            viewHolder?.refresh(mode)
+        }.reduce { acc, i -> acc?.plus((i ?: 0)) }
+        val unitNow = if (!countMode) unit else ""
+        total.text = Settings.getStats(ctx, sum, getTotal(), unitNow)
+    }
+
+    fun invertCountMode() {
+        countMode = !countMode
+        refreshMode(locMode)
+    }
+
+    inner class StatsViewHolder(
+        private val _binding: ItemListGroupBinding
+    ) : RecyclerView.ViewHolder(_binding.root) {
+
+        private lateinit var data: Pair<Int, Groups.Group>
+
+        private lateinit var wwwCount: List<GeoLoc>
+        private lateinit var countryCount: List<GeoLoc>
+        private lateinit var stateCount: List<GeoLoc>
+
+        fun bind(entry: Pair<Int, Groups.Group>): Int {
+            data = entry
+            _binding.groupColor.text = entry.second.name
+
+            val entryColor = data.second.color.color
+            val contrastEntryColor = getContrastColor(entryColor)
+            _binding.groupColor.setBackgroundColor(entryColor)
+            _binding.groupColor.setTextColor(contrastEntryColor)
+            _binding.name.setTextColor(contrastEntryColor)
+
+            _binding.groupColor.setOnClickListener { invertCountMode() }
+            compute()
+            return refresh(locMode)
+        }
+
+        private fun compute() {
+            val visited = Data.visits.getVisitedByValue(data.first)
+            wwwCount = World.WWW.children.filter { it.code in visited }
+            countryCount =
+                World.WWW.children.map { it.children.filter { itt -> itt.code in visited } }
+                    .flatten()
+            stateCount =
+                World.WWW.children.map { it.children.map { itt -> itt.children.filter { ittt -> ittt.code in visited } } }
+                    .flatten().flatten()
+        }
+
+        fun refresh(mode: LocType): Int {
+            locMode = mode
+            return if (countMode) {
+                val count = when (locMode) {
+                    LocType.WORLD -> wwwCount.size
+                    LocType.COUNTRY -> countryCount.size
+                    LocType.STATE -> stateCount.size
+                    else -> -1
+                }
+                _binding.name.text = count.toString()
+                count
+            } else {
+                val area = when (locMode) {
+                    LocType.WORLD -> wwwCount.sumOf { it.area }
+                    LocType.COUNTRY -> countryCount.sumOf { it.area }
+                    LocType.STATE -> stateCount.sumOf { it.area }
+                    else -> -1
+                }
+                _binding.name.text = ctx.getString(R.string.number_with_unit, area, unit)
+                area
+            }
+        }
+
+    }
+}

app/src/main/java/net/helcel/beans/activity/adapter/ViewPagerAdapter.kt

@@ -1,11 +1,13 @@
 package net.helcel.beans.activity.adapter
 
+import android.graphics.drawable.ColorDrawable
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.Lifecycle
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import androidx.viewpager2.widget.ViewPager2
 import net.helcel.beans.activity.fragment.EditPlaceFragment
+import kotlin.math.max
 
 class ViewPagerAdapter(
     fragmentManager: FragmentManager,
@@ -17,15 +19,13 @@ class ViewPagerAdapter(
     private val fragmentList: MutableList<EditPlaceFragment> = ArrayList()
 
     fun addFragment(src: EditPlaceFragment?, target: EditPlaceFragment) {
-        if (src != null) {
+        val idx = fragmentList.indexOf(src)
-            while (fragmentList.last() != src) {
+        viewPager.currentItem = max(0, idx)
-                fragmentList.removeLast()
+        if (src != null && idx >= 0) {
-                notifyItemRemoved(fragmentList.size)
+            fragmentList.subList(idx + 1, fragmentList.size).clear()
         }
-        }
-        println(src.toString() + " -  " + target.toString())
         fragmentList.add(target)
-        notifyItemInserted(fragmentList.size)
+        notifyItemRangeChanged(max(0, idx), fragmentList.size)
         viewPager.currentItem = fragmentList.size - 1
     }
 
@@ -52,6 +52,10 @@ class ViewPagerAdapter(
     override fun createFragment(position: Int): Fragment {
         return fragmentList[position]
     }
+
+    fun refreshColors(colorDrawable: ColorDrawable) {
+        fragmentList.forEach{ it.refreshColors(colorDrawable)}
+    }
 }
 
 

app/src/main/java/net/helcel/beans/activity/fragment/EditGroupAddFragment.kt

@@ -24,7 +24,8 @@ import net.helcel.beans.helper.Theme.colorToHex6
 class EditGroupAddFragment(
     private val key: Int = 0,
     val onAddCb: (Int) -> Unit,
-    val onDelCb: (Int) -> Unit
+    val onDelCb: (Int) -> Unit,
+    private val deleteEnabled: Boolean = true
 ) : DialogFragment() {
 
     private lateinit var _binding: FragmentEditGroupsAddBinding
@@ -42,7 +43,7 @@ class EditGroupAddFragment(
         _binding.colorView.background = ColorDrawable(grp.color.color)
 
 
-        if (key == 0) {
+        if (key == 0 || !deleteEnabled) {
             _binding.btnDelete.visibility = View.INVISIBLE
             _binding.btnDelete.isEnabled = false
         }
@@ -52,8 +53,8 @@ class EditGroupAddFragment(
                 .setPositiveButton(android.R.string.ok) { _, _ ->
                     val pos = Data.groups.findGroupPos(key)
                     // Remove all countries belonging to that group
-                    // Delete the group
                     Data.visits.deleteVisited(key)
+                    // Delete the group
                     Data.groups.deleteGroup(key)
                     Data.saveData()
                     onDelCb(pos)

app/src/main/java/net/helcel/beans/activity/fragment/EditPlaceColorFragment.kt

@@ -3,17 +3,19 @@ package net.helcel.beans.activity.fragment
 import android.app.Dialog
 import android.content.DialogInterface
 import android.os.Bundle
+import android.view.View
 import androidx.fragment.app.DialogFragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import net.helcel.beans.activity.adapter.GeolocListAdapter
+import net.helcel.beans.R
 import net.helcel.beans.activity.adapter.GroupListAdapter
 import net.helcel.beans.databinding.FragmentEditPlacesColorsBinding
 import net.helcel.beans.helper.Data
+import net.helcel.beans.helper.DialogCloser
 
 
-class EditPlaceColorFragment(private val parent: GeolocListAdapter.FoldingListViewHolder) :
+class EditPlaceColorFragment(private val parent: DialogCloser, private val delete: Boolean = false) :
     DialogFragment() {
 
     private lateinit var _binding: FragmentEditPlacesColorsBinding
@@ -21,7 +23,8 @@ class EditPlaceColorFragment(private val parent: GeolocListAdapter.FoldingListVi
     private var clear: Boolean = false
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val builder = MaterialAlertDialogBuilder(requireContext())
+        val ctx = requireContext()
+        val builder = MaterialAlertDialogBuilder(ctx)
         _binding = FragmentEditPlacesColorsBinding.inflate(layoutInflater)
         _binding.btnAdd.setOnClickListener {
             EditGroupAddFragment(0, {
@@ -34,16 +37,24 @@ class EditPlaceColorFragment(private val parent: GeolocListAdapter.FoldingListVi
         }
 
         val dialog = builder.setView(_binding.root).create()
-        listAdapt = GroupListAdapter(requireActivity(), this)
+        listAdapt = GroupListAdapter(requireActivity(), this, delete)
         _binding.groupsColor.layoutManager =
-            LinearLayoutManager(requireContext(), RecyclerView.VERTICAL, false)
+            LinearLayoutManager(ctx, RecyclerView.VERTICAL, false)
         _binding.groupsColor.adapter = listAdapt
 
+        if (delete) {
+            _binding.btnAdd.visibility = View.GONE
+            _binding.btnClear.text = ctx.getString(R.string.cancel)
+            _binding.warningText.text = ctx.getString(R.string.select_group)
+        } else {
+            _binding.warningText.text = ctx.getString(R.string.edit_group)
+        }
+
         return dialog
     }
 
     override fun onDismiss(dialog: DialogInterface) {
         super.onDismiss(dialog)
-        parent.onColorDialogDismiss(clear)
+        parent.onDialogDismiss(clear)
     }
 }

app/src/main/java/net/helcel/beans/activity/fragment/EditPlaceFragment.kt

@@ -1,5 +1,6 @@
 package net.helcel.beans.activity.fragment
 
+import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -8,11 +9,12 @@ import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import net.helcel.beans.activity.adapter.GeolocListAdapter
+import net.helcel.beans.activity.adapter.GeolocListAdapter.FoldingListViewHolder
 import net.helcel.beans.activity.adapter.ViewPagerAdapter
 import net.helcel.beans.countries.GeoLoc
 import net.helcel.beans.databinding.FragmentEditPlacesBinding
 
-class EditPlaceFragment(val loc: GeoLoc, private val pager: ViewPagerAdapter) : Fragment() {
+class EditPlaceFragment(val loc: GeoLoc, private val pager: ViewPagerAdapter, private val holder: FoldingListViewHolder? = null) : Fragment() {
     private lateinit var _binding: FragmentEditPlacesBinding
 
     override fun onCreateView(
@@ -26,7 +28,11 @@ class EditPlaceFragment(val loc: GeoLoc, private val pager: ViewPagerAdapter) :
         _binding.list.setHasFixedSize(true)
         _binding.list.layoutManager =
             LinearLayoutManager(requireContext(), RecyclerView.VERTICAL, false)
-        _binding.list.adapter = GeolocListAdapter(this, loc, pager)
+        _binding.list.adapter = GeolocListAdapter(this, loc, pager, holder)
         return _binding.root
     }
+
+    fun refreshColors(colorDrawable: ColorDrawable) {
+        (_binding.list.adapter as GeolocListAdapter?)?.refreshColors(colorDrawable)
+    }
 }

app/src/main/java/net/helcel/beans/activity/fragment/SettingsFragment.kt

@@ -5,29 +5,79 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.PreferenceManager
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import net.helcel.beans.R
 import net.helcel.beans.countries.GeoLocImporter
+import net.helcel.beans.helper.Data
+import net.helcel.beans.helper.DialogCloser
+import net.helcel.beans.helper.Settings
 
 
-class SettingsFragment : PreferenceFragmentCompat() {
+class SettingsFragment : PreferenceFragmentCompat(), DialogCloser {
+    private var savedInstanceState: Bundle? = null
+    private var rootKey: String? = null
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        this.savedInstanceState = savedInstanceState
+        this.rootKey = rootKey
+
         setPreferencesFromResource(R.xml.fragment_settings, rootKey)
         val ctx = requireContext()
-        findPreference<Preference>(getString(R.string.key_regional))?.setOnPreferenceChangeListener { _, key ->
-            when (key as String) {
-                ctx.getString(R.string.off) -> GeoLocImporter.clearStates()
-                ctx.getString(R.string.on) -> GeoLocImporter.importStates(ctx)
-                else -> GeoLocImporter.clearStates()
-            }
-            true
-        }
 
         // Select Light/Dark/System Mode
         findPreference<Preference>(getString(R.string.key_theme))?.setOnPreferenceChangeListener { _, key ->
             setTheme(ctx, key as String)
         }
 
+        // Select map projection
+        findPreference<Preference>(getString(R.string.key_projection))?.setOnPreferenceChangeListener { _, key ->
+            Settings.refreshProjection()
+        }
+
+        // Toggle groups
+        findPreference<Preference>(getString(R.string.key_group))?.setOnPreferenceChangeListener { _, key ->
+            if (key as String == ctx.getString(R.string.off)) {
+                val fragment = EditPlaceColorFragment(this, true)
+                fragment.show(
+                    this.parentFragmentManager,
+                    "AddColorDialogFragment"
+                )
+                false
+            } else {
+                true
+            }
+        }
+
+        // Toggle regional geolocs
+        findPreference<Preference>(getString(R.string.key_regional))?.setOnPreferenceChangeListener { _, key ->
+            when (key as String) {
+                ctx.getString(R.string.off) -> {
+                    MaterialAlertDialogBuilder(requireActivity())
+                        .setMessage(R.string.delete_regions)
+                        .setPositiveButton(android.R.string.ok) { _, _ ->
+                            GeoLocImporter.clearStates()
+                            PreferenceManager.getDefaultSharedPreferences(ctx).edit().putString(
+                                ctx.getString(R.string.key_regional),
+                                ctx.getString(R.string.off)
+                            ).apply()
+                            refreshPreferences()
+                        }
+                        .setNegativeButton(android.R.string.cancel) { _, _ -> }
+                        .show()
+                    false
+                }
+
+                ctx.getString(R.string.on) -> {
+                    GeoLocImporter.importStates(ctx, true)
+                    true
+                }
+
+                else -> false
+            }
+        }
+
+
         // Open license fragment
         findPreference<Preference>(getString(R.string.licenses))?.setOnPreferenceClickListener {
             requireActivity().supportFragmentManager.beginTransaction()
@@ -59,4 +109,34 @@ class SettingsFragment : PreferenceFragmentCompat() {
             return true
         }
     }
+
+    override fun onDialogDismiss(clear: Boolean) {
+        // When turning groups off, select one group to keep and reassign everything
+        Data.selected_group?.let { selectedGroup ->
+            // Reassign all visited that are not to selectedGroup to selectedGroup
+            Data.visits.reassignAllVisitedToGroup(selectedGroup.key)
+
+            // Delete all groups that are not selectedGroup
+            Data.groups.deleteAllExcept(selectedGroup.key)
+
+            // Save and clear global variables
+            Data.saveData()
+            Data.selected_geoloc = null
+            Data.selected_group = null
+
+            // Actually change preference
+            val ctx = requireContext()
+            val sp = PreferenceManager.getDefaultSharedPreferences(ctx)
+            sp.edit().putString(ctx.getString(R.string.key_group), ctx.getString(R.string.off))
+                .apply()
+
+            // Refresh entire preference fragment to reflect changes
+            refreshPreferences()
+        }
+    }
+
+    private fun refreshPreferences() {
+        preferenceScreen.removeAll()
+        onCreatePreferences(savedInstanceState, rootKey)
+    }
 }

app/src/main/java/net/helcel/beans/countries/Country.kt

@@ -8,8 +8,6 @@ enum class Country(
     HKG("Hong Kong", 1104),
     MAC("Macao", 32),
     ANT("Netherlands Antilles", 800),
-
-
     AFG("Afghanistan", 645487),
     XAD("Akrotiri and Dhekelia", 234),
     ALA("Åland", 1483),
@@ -217,7 +215,7 @@ enum class Country(
     SLB("Solomon Islands", 28686),
     SOM("Somalia", 637672),
     ZAF("South Africa", 1224059),
-    SGS("South Georgia and the South Sand", 4085),
+    SGS("South Georgia and the South Sandwich Islands", 4085),
     KOR("South Korea", 100721),
     SSD("South Sudan", 632186),
     ESP("Spain", 506617),
@@ -248,7 +246,7 @@ enum class Country(
     ARE("United Arab Emirates", 71429),
     GBR("United Kingdom", 244732),
     USA("United States", 9477483),
-    UMI("United States Minor Outlying Isl", 47),
+    UMI("United States Minor Outlying Islands", 47),
     URY("Uruguay", 178103),
     UZB("Uzbekistan", 447894),
     VUT("Vanuatu", 12384),
@@ -265,5 +263,5 @@ enum class Country(
 
     override val code = this.name
     override val type = GeoLoc.LocType.COUNTRY
-    override val children: MutableList<GeoLoc> = ArrayList()
+    override val children: MutableSet<GeoLoc> = HashSet()
 }

app/src/main/java/net/helcel/beans/countries/GeoLoc.kt

@@ -1,13 +1,9 @@
 package net.helcel.beans.countries
 
-import android.content.Context
-import net.helcel.beans.helper.Settings
-
-
 interface GeoLoc {
 
-    enum class LocType {
+    enum class LocType(val txt: String) {
-        WORLD, GROUP, CUSTOM_GROUP, COUNTRY, STATE;
+        WORLD("Continents"), GROUP("Groups"), CUSTOM_GROUP("Groups"), COUNTRY("Countries"), STATE("Regions");
     }
 
     val code: String
@@ -15,16 +11,5 @@ interface GeoLoc {
     val area: Int
 
     val type: LocType
-    val children: List<GeoLoc>
+    val children: Set<GeoLoc>
-
-    fun shouldShowChildren(ctx: Context): Boolean {
-        if (children.isEmpty())
-            return false
-        if (type == LocType.COUNTRY && !Settings.isRegional(ctx))
-            return false
-        return true
 }
-
-}
-
-

app/src/main/java/net/helcel/beans/countries/GeoLocImporter.kt

@@ -1,25 +1,44 @@
 package net.helcel.beans.countries
 
 import android.content.Context
+import net.helcel.beans.helper.AUTO_GROUP
+import net.helcel.beans.helper.Data
+import net.helcel.beans.helper.NO_GROUP
 import net.helcel.beans.helper.Settings
 import java.io.BufferedReader
 import java.io.InputStreamReader
 
 object GeoLocImporter {
 
-    fun importStates(ctx: Context) {
+    fun importStates(ctx: Context, force: Boolean = false) {
-        if (!Settings.isRegional(ctx)) {
+        if (!Settings.isRegional(ctx) and !force) {
             return
         }
         val fs = BufferedReader(InputStreamReader(ctx.assets.open("geoloc_state.txt")))
         while (fs.ready()) {
             val line = fs.readLine().split("|")
             val state = State(line[0], line[2], line[3].toInt())
-            Country.entries.find { it.code == line[1] }?.children?.add(state)
+            val country = Country.entries.find { it.code == line[1] }
+            country?.children?.add(state)
+            country?.let {
+                if (Data.visits.getVisited(it) == NO_GROUP) {
+                    Data.visits.setVisited(state, NO_GROUP)
+                }
+            }
         }
     }
 
     fun clearStates() {
-        Country.entries.forEach { it.children.clear() }
+        Country.entries.forEach { country ->
+            if (country.children.any { region ->
+                    Data.visits.getVisited(region) != NO_GROUP
+                }) {
+                if (Data.visits.getVisited(country) == NO_GROUP) {
+                    Data.visits.setVisited(country, AUTO_GROUP)
+                }
+            }
+            country.children.clear()
+        }
+        Data.saveData()
     }
 }

app/src/main/java/net/helcel/beans/countries/Group.kt

@@ -2,10 +2,12 @@ package net.helcel.beans.countries
 
 import net.helcel.beans.countries.Country.*
 
-enum class Group(override val fullName: String, override val children: List<GeoLoc>) : GeoLoc {
+enum class Group(override val fullName: String, override val children: Set<GeoLoc>) : GeoLoc {
 
     EEE(
-        "Europe", listOf(
+        "Europe", setOf(
+            XAD,
+            ALA,// Åland Islands: an autonomous region of Finland, but not a member of the EU or UN
             ALB,
             AND,
             AUT,
@@ -18,14 +20,19 @@ enum class Group(override val fullName: String, override val children: List<GeoL
             CZE,
             DNK,
             EST,
+            FRO, // Faroe Islands: an autonomous region of Denmark
             FIN,
             FRA,
             DEU,
+            GIB, // Gibraltar: a British overseas territory located at the southern tip of the Iberian Peninsula
             GRC,
+            GGY, // Guernsey: a British Crown dependency in the English Channel
             HUN,
             ISL,
             IRL,
+            IMN, // Isle of Man: a British Crown dependency located in the Irish Sea
             ITA,
+            JEY, // Jersey: a British Crown dependency located in the English Channel
             KAZ,
             XKO,
             LVA,
@@ -48,25 +55,28 @@ enum class Group(override val fullName: String, override val children: List<GeoL
             SVK,
             SVN,
             ESP,
+            SJM, // Svalbard and Jan Mayen: an archipelago administered by Norway
             SWE,
             CHE,
             UKR,
             GBR,
             VAT,
-            XAD,
         )
     ),
     ABB(
-        "Asia", listOf(
+        "Asia", setOf(
             AFG,
             ARM,
             AZE,
             BHR,
             BGD,
             BTN,
+            IOT, // British Indian Ocean Territory: a British overseas territory in the Indian Ocean
             BRN,
             KHM,
+            CCK, // Cocos (Keeling) Islands: an Australian external territory in the Indian Ocean
             CHN,
+            CXR, // Christmas Island: an Australian external territory in the Indian Ocean
             GEO,
             HKG,
             IND,
@@ -111,7 +121,7 @@ enum class Group(override val fullName: String, override val children: List<GeoL
         )
     ),
     FFF(
-        "Africa", listOf(
+        "Africa", setOf(
             DZA,
             AGO,
             BDI,
@@ -131,8 +141,8 @@ enum class Group(override val fullName: String, override val children: List<GeoL
             EGY,
             GNQ,
             ERI,
-            SWZ,
             ETH,
+            ATF, // French Southern and Antarctic Lands: a territory of France located in the southern Indian Ocean
             GAB,
             GMB,
             GHA,
@@ -165,6 +175,7 @@ enum class Group(override val fullName: String, override val children: List<GeoL
             SSD,
             SHN,
             SDN,
+            SWZ,
             TZA,
             TGO,
             TUN,
@@ -176,7 +187,7 @@ enum class Group(override val fullName: String, override val children: List<GeoL
         )
     ),
     NNN(
-        "North America", listOf(
+        "North America", setOf(
             ABW,
             AIA,
             ATG,
@@ -184,9 +195,11 @@ enum class Group(override val fullName: String, override val children: List<GeoL
             BRB,
             BLZ,
             BMU,
+            BES, // Bonaire, Sint Eustatius and Saba: special municipalities of the Netherlands in the Caribbean
             VGB,
             CAN,
             CYM,
+            XCL,
             CRI,
             CUB,
             CUW,
@@ -208,19 +221,22 @@ enum class Group(override val fullName: String, override val children: List<GeoL
             NIC,
             PAN,
             PRI,
+            BLM, // Saint Barthélemy: an overseas collectivity of France in the Caribbean
             KNA,
             LCA,
             MAF,
             SPM,
             VCT,
+            SXM, // Sint Maarten: a constituent country of the Kingdom of the Netherlands in the Caribbean
             TTO,
             TCA,
             USA,
-            XCL,
+            UMI, // United States Minor Outlying Islands: a collection of nine insular areas of the United States
+            VIR, // United States Virgin Islands: an unincorporated territory of the United States in the Caribbean
         )
     ),
     SRR(
-        "South America", listOf(
+        "South America", setOf(
             ARG,
             BOL,
             BRA,
@@ -238,7 +254,7 @@ enum class Group(override val fullName: String, override val children: List<GeoL
         )
     ),
     UUU(
-        "Oceania", listOf(
+        "Oceania", setOf(
             ASM,
             AUS,
             COK,
@@ -257,6 +273,7 @@ enum class Group(override val fullName: String, override val children: List<GeoL
             PLW,
             PNG,
             PCN,
+            WSM, // Samoa: an independent island nation in the South Pacific
             SLB,
             TKL,
             TON,
@@ -267,39 +284,22 @@ enum class Group(override val fullName: String, override val children: List<GeoL
     ),
 
     XXX(
-        "Others", listOf(
+        "Others", setOf(
             ATA, // Antarctica: not in any other region
-            ALA,// Åland Islands: an autonomous region of Finland, but not a member of the EU or UN
-            BES,// Bonaire, Sint Eustatius and Saba: special municipalities of the Netherlands in the Caribbean
             BVT, // Bouvet Island: an uninhabited territory of Norway in the South Atlantic
-            IOT,// British Indian Ocean Territory: a British overseas territory in the Indian Ocean
-            CXR,// Christmas Island: an Australian external territory in the Indian Ocean
-            CCK,// Cocos (Keeling) Islands: an Australian external territory in the Indian Ocean
-            FRO,// Faroe Islands: an autonomous region of Denmark
-            ATF,// French Southern and Antarctic Lands: a territory of France located in the southern Indian Ocean
-            GIB,// Gibraltar: a British overseas territory located at the southern tip of the Iberian Peninsula
-            GGY,// Guernsey: a British Crown dependency in the English Channel
             HMD, // Heard Island and McDonald Islands: an uninhabited Australian external territory in the southern Indian Ocean
-            IMN,// Isle of Man: a British Crown dependency located in the Irish Sea
-            JEY,// Jersey: a British Crown dependency located in the English Channel
-            BLM,// Saint Barthélemy: an overseas collectivity of France in the Caribbean
-            WSM, // Samoa: an independent island nation in the South Pacific
-            SXM, // Sint Maarten: a constituent country of the Kingdom of the Netherlands in the Caribbean
             SGS, // South Georgia and the South Sandwich Islands: a British overseas territory in the southern Atlantic Ocean
-            SJM, // Svalbard and Jan Mayen: an archipelago administered by Norway
-            UMI, // United States Minor Outlying Islands: a collection of nine insular areas of the United States
-            VIR, // United States Virgin Islands: an unincorporated territory of the United States in the Caribbean
         )
     ),
 
     ZZZ(
-        "Undefined", listOf(
+        "Undefined", setOf(
         )
     ),
 
 
     NTT(
-        "NATO", listOf(
+        "NATO", setOf(
             ALB, BEL, BGR, CAN, HRV, CZE, DNK, EST, FRA, DEU, GRC, HUN, ISL, ITA, LVA, LTU, LUX,
             MNE, NLD, NOR, POL, PRT, ROU, SVK, SVN, ESP, TUR, GBR, USA
         )

app/src/main/java/net/helcel/beans/countries/State.kt

@@ -3,6 +3,17 @@ package net.helcel.beans.countries
 class State(override val code: String, override val fullName: String, override val area: Int) :
     GeoLoc {
 
-    override val children = emptyList<GeoLoc>()
+    override val children = emptySet<GeoLoc>()
     override val type = GeoLoc.LocType.STATE
+
+    override fun hashCode(): Int {
+        return code.hashCode()
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (other is GeoLoc) {
+            return other.code == this.code
+        }
+        return false
+    }
 }

app/src/main/java/net/helcel/beans/countries/World.kt

@@ -2,19 +2,18 @@ package net.helcel.beans.countries
 
 import net.helcel.beans.countries.Group.*
 
-enum class World(override val fullName: String, override val children: List<GeoLoc>) : GeoLoc {
+enum class World(override val fullName: String, override val children: Set<GeoLoc>) : GeoLoc {
 
-    WWW("World", listOf(
+    WWW(
+        "World", setOf(
             EEE, ABB, FFF, NNN, SRR, UUU, XXX
-    ));
+        )
+    );
 
     override val area = children.fold(0) { acc, i ->
         acc + i.area
     }
     
-
     override val type = GeoLoc.LocType.WORLD
     override val code = this.name
-
-
 }

app/src/main/java/net/helcel/beans/helper/Data.kt

@@ -10,13 +10,12 @@ import net.helcel.beans.countries.GeoLoc
 import java.util.HashMap
 
 object Data {
-
-
     var visits : Visits = Visits(0, HashMap())
     var groups : Groups = Groups(0,HashMap())
 
     var selected_group : Groups.Group? = null
     var selected_geoloc: GeoLoc? = null
+    var clearing_geoloc: GeoLoc? = null
 
     private val groupsSerial = Groups.GroupsSerializer()
     private val visitsSerial = Visits.VisitsSerializer()
@@ -34,10 +33,9 @@ fun loadData(ctx: Context, id:Int) {
 
         // Add default group "Visited" with app's color if there is no group already
         if (groups.size() == 0) {
-        groups.setGroup(1, "Visited", ColorDrawable(ContextCompat.getColor(ctx, R.color.blue)))
+            groups.setGroup(DEFAULT_GROUP, "Visited", ColorDrawable(ContextCompat.getColor(ctx, R.color.blue)))
             saveData()
         }
-
     }
 
     fun saveData() {

app/src/main/java/net/helcel/beans/helper/DialogCloser.kt

@@ -0,0 +1,5 @@
+package net.helcel.beans.helper
+
+interface DialogCloser {
+    fun onDialogDismiss(clear: Boolean)
+}

app/src/main/java/net/helcel/beans/helper/Groups.kt

@@ -2,17 +2,24 @@ package net.helcel.beans.helper
 
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
+import androidx.core.content.ContextCompat
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Serializer
 import kotlinx.serialization.json.Json
+import net.helcel.beans.R
 import java.io.InputStream
+import kotlin.coroutines.coroutineContext
 import kotlin.random.Random
 
 
 private const val randSeed = 0
 private val rnd = Random(randSeed)
 
+const val NO_GROUP = 0
+const val DEFAULT_GROUP = 1
+const val AUTO_GROUP = -1
+
 @Serializable
 class Groups(val id: Int, private val grps: HashMap<Int, Group>) {
 
@@ -24,13 +31,18 @@ class Groups(val id: Int, private val grps: HashMap<Int, Group>) {
         grps.remove(key)
     }
 
+    fun deleteAllExcept(grp: Int) {
+        val keysToDelete = grps.keys.filter { it != grp }
+        keysToDelete.forEach { grps.remove(it) }
+    }
+
     fun getGroupFromKey(key: Int): Group {
         return grps.getOrDefault(key, EmptyGroup())
     }
 
     fun genKey(): Int {
         val key = rnd.nextInt()
-        if (grps.containsKey(key) || key == 0) return genKey()
+        if (grps.containsKey(key) || key in listOf(NO_GROUP, DEFAULT_GROUP, AUTO_GROUP)) return genKey()
         return key
     }
 
@@ -63,7 +75,7 @@ class Groups(val id: Int, private val grps: HashMap<Int, Group>) {
         val key: Int,
         val name: String,
         @Serializable(with = Theme.ColorDrawableSerializer::class) val color: ColorDrawable = ColorDrawable(
-            Color.TRANSPARENT
+            Color.GRAY
         )
     )
 

app/src/main/java/net/helcel/beans/helper/Settings.kt

@@ -4,12 +4,15 @@ import android.content.Context
 import android.content.SharedPreferences
 import androidx.preference.PreferenceManager
 import net.helcel.beans.R
+import net.helcel.beans.activity.MainActivity
 import net.helcel.beans.activity.fragment.SettingsFragment
 
 object Settings {
 
     private lateinit var sp: SharedPreferences
-    fun start(ctx: Context) {
+    private lateinit var mainActivity: MainActivity
+    fun start(ctx: MainActivity) {
+        mainActivity = ctx
         sp = PreferenceManager.getDefaultSharedPreferences(ctx)
         SettingsFragment.setTheme(
             ctx, sp.getString(ctx.getString(R.string.key_theme), ctx.getString(R.string.system))
@@ -37,6 +40,11 @@ object Settings {
         )
     }
 
+    fun refreshProjection(): Boolean {
+        mainActivity.refreshProjection()
+        return true
+    }
+
     private fun getBooleanValue(ctx: Context, key: String?): Boolean {
         return when (key) {
             ctx.getString(R.string.on) -> true
@@ -44,4 +52,24 @@ object Settings {
             else -> false
         }
     }
+
+    fun getStats(ctx: Context, numerator: Int?, denominator: Int?, unit: String = ""): String {
+        if (numerator == null || denominator == null || denominator == 0) {
+            return ""
+        }
+        return when (getStatPref(ctx)) {
+            ctx.getString(R.string.percentages) -> ctx.getString(
+                R.string.percentage,
+                (100 * (numerator.toFloat() / denominator.toFloat())).toInt()
+            )
+
+            else -> {
+                if (unit == "") {
+                    ctx.getString(R.string.rate, numerator, denominator)
+                } else {
+                    ctx.getString(R.string.rate_with_unit, numerator, denominator, unit)
+                }
+            }
+        }
+    }
 }

app/src/main/java/net/helcel/beans/helper/Theme.kt

@@ -29,7 +29,6 @@ object Theme {
     }
 
     fun createActionBar(ctx: AppCompatActivity, title: String) {
-        ctx.supportActionBar?.setBackgroundDrawable(colorWrapper(ctx, android.R.attr.colorPrimary))
         ctx.supportActionBar?.title = title
         ctx.supportActionBar?.setDisplayHomeAsUpEnabled(true)
     }

app/src/main/java/net/helcel/beans/helper/Visits.kt

@@ -27,7 +27,7 @@ class Visits(val id: Int, private val locs: HashMap<String, Int>) {
     }
 
     fun getVisited(key: GeoLoc): Int {
-        return locs.getOrDefault(key.code, 0)
+        return getVisited(key.code)
     }
 
     private fun getVisited(key: String): Int {
@@ -42,6 +42,19 @@ class Visits(val id: Int, private val locs: HashMap<String, Int>) {
         return locs.keys.groupBy { getVisited(it) }
     }
 
+    fun getVisitedByValue(key: Int): List<String> {
+        return locs.filter { it.value == key }.keys.toList()
+    }
+
+    fun reassignAllVisitedToGroup(group: Int) {
+        val keys = locs.filter { (_, grp) ->
+            grp !in listOf(NO_GROUP, AUTO_GROUP)
+        }.keys
+        keys.forEach {
+            locs[it] = group
+        }
+    }
+
     @OptIn(ExperimentalSerializationApi::class)
     @Serializer(Visits::class)
     class VisitsSerializer {

app/src/main/java/net/helcel/beans/svg/CSSWrapper.kt

@@ -2,41 +2,55 @@ package net.helcel.beans.svg
 
 import android.content.Context
 import net.helcel.beans.countries.World
+import net.helcel.beans.helper.AUTO_GROUP
 import net.helcel.beans.helper.Data.groups
 import net.helcel.beans.helper.Data.visits
+import net.helcel.beans.helper.NO_GROUP
+import net.helcel.beans.helper.Settings
 import net.helcel.beans.helper.Theme.colorToHex6
 import net.helcel.beans.helper.Theme.colorWrapper
 
-class CSSWrapper(ctx: Context) {
+class CSSWrapper(private val ctx: Context) {
 
     private val colorForeground: String =
         colorToHex6(colorWrapper(ctx, android.R.attr.panelColorBackground))
     private val colorBackground: String =
         colorToHex6(colorWrapper(ctx, android.R.attr.colorBackground))
 
-    private val baseCSS: String
+    private val continents: String = World.WWW.children.joinToString(",") { "#${it.code}2" }
+    private val countries: String = World.WWW.children.joinToString(",") { itt ->
+        itt.children.joinToString(",") { "#${it.code}2" }
+    }
+    private val regional: String = World.WWW.children.joinToString(",") { itt ->
+        itt.children.joinToString(",") { "#${it.code}1" }
+    }
+    private val countryOnlyCSS: String =
+        "svg{fill:$colorForeground;stroke:$colorBackground;stroke-width:0.1;}" +
+                "${regional}{display:none;}"
+    private val countryRegionalCSS: String =
+        "svg{fill:$colorForeground;stroke:$colorBackground;stroke-width:0.01;}" +
+                "$continents,$countries{fill:none;stroke:$colorBackground;stroke-width:0.1;}"
     private var customCSS: String = ""
 
     init {
-        val www = World.WWW.children.joinToString(",") { "#${it.code}2" }
-        val ccc = World.WWW.children.joinToString(",") { itt ->
-            itt.children.joinToString(",") { "#${it.code}2" }
-        }
-        baseCSS = "svg{fill:$colorForeground;stroke:$colorBackground;stroke-width:0.01;}" +
-                "$www,$ccc{stroke:$colorBackground;stroke-width:0.1;fill:none}"
         refresh()
     }
 
-    fun refresh() {
+    private fun refresh() {
+        val id = if (Settings.isRegional(ctx)) "1" else "2"
         customCSS = visits.getVisitedByValue().map { (k, v) ->
-            if (groups.getGroupFromKey(k).key == 0)
+            (if (groups.getGroupFromKey(k).key != NO_GROUP) {
-                ""
+                v
-            else
+            } else if (!Settings.isRegional(ctx) && k == AUTO_GROUP) {
-                v.joinToString(",") { "#${it}1,#${it}" } + "{fill:${
+                v.filter { it !in World.WWW.children.map { it1 -> it1.code } }
+            } else {
+                emptyList()
+            }).takeIf { it.isNotEmpty() }
+                ?.joinToString(",") { "#${it}$id,#${it}" } + "{fill:${
                 colorToHex6(
-                        groups.getGroupFromKey(
+                    if (k == AUTO_GROUP)
-                            k
+                        colorWrapper(ctx, android.R.attr.colorPrimary)
-                        ).color
+                    else groups.getGroupFromKey(k).color
                 )
             };}"
         }.joinToString("")
@@ -44,7 +58,11 @@ class CSSWrapper(ctx: Context) {
 
     fun get(): String {
         refresh()
-        return baseCSS + customCSS
+        return if (Settings.isRegional(ctx)) {
+            countryRegionalCSS + customCSS
+        } else {
+            countryOnlyCSS + customCSS
+        }
     }
 
 }

app/src/main/java/net/helcel/beans/svg/SVGWrapper.kt

@@ -1,11 +1,24 @@
 package net.helcel.beans.svg
 
 import android.content.Context
+import androidx.preference.PreferenceManager
 import com.caverock.androidsvg.SVG
+import net.helcel.beans.R
 
 class SVGWrapper(ctx: Context) {
 
-    private var svg: SVG? = SVG.getFromAsset(ctx.assets, "mercator01.svg")
+    val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(ctx)
+    private val svgFile = when (sharedPreferences.getString(
+        ctx.getString(R.string.key_projection),
+        ctx.getString(R.string.mercator)
+    )) {
+        ctx.getString(R.string.azimuthalequidistant) -> "aeqd01.svg"
+        ctx.getString(R.string.loximuthal) -> "loxim01.svg"
+        ctx.getString(R.string.mercator) -> "webmercator01.svg"
+        else -> "webmercator01.svg"
+    }
+
+    private var svg: SVG? = SVG.getFromAsset(ctx.assets, svgFile)
 
     fun get(): SVG? {
         return svg

app/src/main/res/drawable/back.xml

@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+    
+</vector>

app/src/main/res/drawable/color.xml

@@ -0,0 +1,10 @@
+<vector
+    android:height="24dp"
+    android:viewportHeight="960"
+    android:viewportWidth="960"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+<path
+    android:fillColor="@color/white"
+    android:pathData="M346,820L100,574Q90,564 85,552Q80,540 80,527Q80,514 85,502Q90,490 100,480L330,251L224,145L286,80L686,480Q696,490 700.5,502Q705,514 705,527Q705,540 700.5,552Q696,564 686,574L440,820Q430,830 418,835Q406,840 393,840Q380,840 368,835Q356,830 346,820ZM393,314L179,528Q179,528 179,528Q179,528 179,528L607,528Q607,528 607,528Q607,528 607,528L393,314ZM792,840Q756,840 731,814.5Q706,789 706,752Q706,725 719.5,701Q733,677 750,654L792,600L836,654Q852,677 866,701Q880,725 880,752Q880,789 854,814.5Q828,840 792,840Z"/>
+</vector>

app/src/main/res/drawable/delete.xml

@@ -8,34 +8,34 @@
       android:strokeLineJoin="round"
       android:strokeWidth="4"
       android:fillColor="#00000000"
-      android:strokeColor="#000000"
+      android:strokeColor="?attr/colorOnBackground"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M51,25v31c0,2.209 -1.791,4 -4,4H25c-2.209,0 -4,-1.791 -4,-4V25"
       android:strokeLineJoin="round"
       android:strokeWidth="4"
       android:fillColor="#00000000"
-      android:strokeColor="#000000"
+      android:strokeColor="?attr/colorOnBackground"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M17,16h38v4h-38z"
       android:strokeLineJoin="round"
       android:strokeWidth="4"
       android:fillColor="#00000000"
-      android:strokeColor="#000000"
+      android:strokeColor="?attr/colorOnBackground"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M41,28.25L41,55"
       android:strokeLineJoin="round"
       android:strokeWidth="4"
       android:fillColor="#00000000"
-      android:strokeColor="#000000"
+      android:strokeColor="?attr/colorOnBackground"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M31,28.25L31,55"
       android:strokeLineJoin="round"
       android:strokeWidth="4"
       android:fillColor="#00000000"
-      android:strokeColor="#000000"
+      android:strokeColor="?attr/colorOnBackground"
       android:strokeLineCap="round"/>
 </vector>

app/src/main/res/drawable/edit.xml

@@ -5,6 +5,6 @@
     android:width="24dp"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <path
-        android:fillColor="?attr/colorOnBackground"
+        android:fillColor="@color/white"
         android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
 </vector>

app/src/main/res/drawable/group.xml

@@ -0,0 +1,16 @@
+<vector
+android:height="24dp"
+android:viewportHeight="24"
+android:viewportWidth="24"
+android:width="24dp"
+xmlns:android="http://schemas.android.com/apk/res/android" >
+
+<path android:fillColor="?attr/colorOnBackground" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
+
+<path android:fillColor="?attr/colorPrimary" android:pathData="M8,14m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
+
+<path android:fillColor="?attr/colorPrimary" android:pathData="M12,8m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
+
+<path android:fillColor="?attr/colorPrimary" android:pathData="M16,14m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
+
+</vector>

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

@@ -5,6 +5,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@color/blue"
+        android:fillColor="@color/darkgray"
         android:pathData="M0,0h960v960h-960z" />
 </vector>

app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -1,13 +1,50 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="12dp"
+    android:width="108dp"
-    android:height="12dp"
+    android:height="108dp"
-    android:viewportWidth="1600"
+    android:viewportWidth="128"
-    android:viewportHeight="1600">
+    android:viewportHeight="128">
+  <group android:scaleX="0.8918919"
+      android:scaleY="0.8918919"
+      android:translateX="6.918919"
+      android:translateY="6.918919">
 
+      <group
+          android:scaleX="1.5"
+          android:scaleY="1.5"
+          android:translateX="10"
+          android:translateY="10">
           <path
+              android:pathData="M36,36m-28,0a28,28 0,1 1,56 0a28,28 0,1 1,-56 0"
+              android:strokeLineJoin="round"
+              android:strokeWidth="2"
+              android:fillColor="@color/blue"
+              android:strokeColor="#000000"
+              android:strokeLineCap="round"/>
+
+      </group>
+      <group
+          android:scaleX="1.25"
+          android:scaleY="1.25"
+          android:translateX="18"
+          android:translateY="18">
+          <path
+              android:pathData="M56.803,45.75c0.599,-0.299 1.157,-0.672 1.663,-1.11 0.804,-0.698 1.463,-1.546 1.94,-2.497 0.599,-1.303 0.883,-2.728 0.829,-4.161 0.034,-1.498 -0.154,-2.994 -0.558,-4.437 -0.451,-1.645 -1.104,-3.229 -1.944,-4.714 -0.967,-2.141 -2.28,-4.108 -3.887,-5.822 -1.242,-1.326 -2.757,-2.366 -4.44,-3.048 -0.877,-0.372 -1.821,-0.56 -2.774,-0.553 -1.402,0.074 -2.729,0.697 -3.882,1.389 -1.285,0.81 -2.244,1.735 -2.771,3.053 -0.739,2.362 0.827,4.821 1.113,5.269 0.003,0.005 0.187,0.281 0.555,0.832 1.512,2.264 1.589,2.358 1.666,2.495 0.646,1.221 1.114,2.528 1.389,3.882 1.043,4.001 1.565,6.001 2.223,6.932 1.208,1.71 3.455,3.414 5.826,3.325 1.059,-0.088 2.093,-0.371 3.05,-0.835Z"
+              android:strokeWidth="2"
               android:fillColor="@color/white"
-        android:fillType="nonZero"
+              android:strokeColor="#000000"
-        android:pathData="m800,1200q-83,0 -156,-31.5Q571,1137 517,1083 463,1029 431.5,956 400,883 400,800 400,717 431.5,644 463,571 517,517 571,463 644,431.5 717,400 800,400q83,0 156,31.5 73,31.5 127,85.5 54,54 85.5,127 31.5,73 31.5,156 0,83 -31.5,156 -31.5,73 -85.5,127 -54,54 -127,85.5 -73,31.5 -156,31.5zM800,1120q134,0 227,-93 93,-93 93,-227 0,-7 -0.5,-14.5 -0.5,-7.5 -0.5,-12.5 -5,29 -27,48 -22,19 -52,19L960,840Q927,840 903.5,816.5 880,793 880,760L880,720L720,720v-80q0,-33 23.5,-56.5Q767,560 800,560h40v0q0,-23 12.5,-40.5Q865,502 883,491q-20,-5 -40.5,-8 -20.5,-3 -42.5,-3 -134,0 -227,93 -93,93 -93,227 0,0 0,0 0,0 0,0h200q66,0 113,47 47,47 47,113v40L720,1000v110q20,5 39.5,7.5 19.5,2.5 40.5,2.5z"
+              android:strokeLineCap="round"/>
-        android:strokeWidth="1"
+          <path
-        android:strokeColor="#00000000" />
+              android:pathData="M22,41c-1.54,0.554 -2.83,1.642 -3.636,3.066 -0.714,1.365 -0.957,2.928 -0.693,4.445 0.178,1.247 0.632,2.439 1.329,3.488 2.032,3.228 5.383,4.423 7,5 1.613,0.561 3.295,0.897 5,1 2.387,0.205 6.923,0.535 11,-2 1.287,-0.665 2.335,-1.713 3,-3 0.661,-1.601 0.661,-3.399 0,-5 -0.389,-1.156 -1.121,-2.165 -2.099,-2.894 -0.919,-0.599 -1.974,-0.956 -3.069,-1.039 -2.057,-0.313 -2.756,0.139 -5.014,0.057 -1.271,-0.019 -2.534,-0.214 -3.753,-0.577 -3.036,-0.95 -3.33,-2.457 -5.889,-2.829 -1.066,-0.158 -2.155,-0.061 -3.177,0.282Z"
+              android:strokeWidth="2"
+              android:fillColor="@color/red"
+              android:strokeColor="#000000"
+              android:strokeLineCap="round"/>
+          <path
+              android:pathData="M12.7,26.975c1.758,-3.604 5.311,-3.191 9.58,-7.091 2.701,-2.469 2.858,-4.078 5.613,-5.202 1.407,-0.644 2.984,-0.819 4.498,-0.5 2.053,0.475 3.761,1.891 4.61,3.819 1.116,2.742 -0.314,5.437 -1.398,7.482 -0.951,1.689 -2.167,3.215 -3.602,4.518 -1.479,1.552 -3.161,2.898 -5,4 -2.629,1.541 -6.332,3.711 -9.989,2.43 -1.481,-0.548 -2.768,-1.521 -3.699,-2.796 -1.496,-1.906 -1.735,-4.512 -0.612,-6.659Z"
+              android:strokeWidth="2"
+              android:fillColor="@color/green"
+              android:strokeColor="#000000"
+              android:strokeLineCap="round"/>
+      </group>
+  </group>
 </vector>

app/src/main/res/drawable/map.xml

@@ -0,0 +1,16 @@
+<vector
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <path
+        android:fillColor="?attr/colorOnBackground"
+        android:pathData="M20.5,3l-0.16,0.03L15,5.1 9,3 3.36,4.9c-0.21,0.07 -0.36,0.25 -0.36,0.48L3,20.5c0,0.28 0.22,0.5 0.5,0.5l0.16,-0.03L9,18.9l6,2.1 5.64,-1.9c0.21,-0.07 0.36,-0.25 0.36,-0.48L21,3.5c0,-0.28 -0.22,-0.5 -0.5,-0.5zM10,5.47l4,1.4v11.66l-4,-1.4L10,5.47zM5,6.46l3,-1.01v11.7l-3,1.16L5,6.46zM19,17.54l-3,1.01L16,6.86l3,-1.16v11.84z" />
+
+    <path
+        android:fillColor="?attr/colorPrimary"
+        android:pathData="M15,18.89l-6,-2.11L9,5.11l6,2.11v11.67z"/>
+
+</vector>

app/src/main/res/drawable/palette.xml

@@ -7,7 +7,7 @@
 
     <path
         android:fillColor="?attr/colorOnBackground"
-        android:pathData="M12,2C6.49,2 2,6.49 2,12s4.49,10 10,10c1.38,0 2.5,-1.12 2.5,-2.5c0,-0.61 -0.23,-1.2 -0.64,-1.67c-0.08,-0.1 -0.13,-0.21 -0.13,-0.33c0,-0.28 0.22,-0.5 0.5,-0.5H16c3.31,0 6,-2.69 6,-6C22,6.04 17.51,2 12,2zM17.5,13c-0.83,0 -1.5,-0.67 -1.5,-1.5c0,-0.83 0.67,-1.5 1.5,-1.5s1.5,0.67 1.5,1.5C19,12.33 18.33,13 17.5,13zM14.5,9C13.67,9 13,8.33 13,7.5C13,6.67 13.67,6 14.5,6S16,6.67 16,7.5C16,8.33 15.33,9 14.5,9zM5,11.5C5,10.67 5.67,10 6.5,10S8,10.67 8,11.5C8,12.33 7.33,13 6.5,13S5,12.33 5,11.5zM11,7.5C11,8.33 10.33,9 9.5,9S8,8.33 8,7.5C8,6.67 8.67,6 9.5,6S11,6.67 11,7.5z" />
+        android:pathData="M12,22C6.49,22 2,17.51 2,12S6.49,2 12,2s10,4.04 10,9c0,3.31 -2.69,6 -6,6h-1.77c-0.28,0 -0.5,0.22 -0.5,0.5c0,0.12 0.05,0.23 0.13,0.33c0.41,0.47 0.64,1.06 0.64,1.67C14.5,20.88 13.38,22 12,22zM12,4c-4.41,0 -8,3.59 -8,8s3.59,8 8,8c0.28,0 0.5,-0.22 0.5,-0.5c0,-0.16 -0.08,-0.28 -0.14,-0.35c-0.41,-0.46 -0.63,-1.05 -0.63,-1.65c0,-1.38 1.12,-2.5 2.5,-2.5H16c2.21,0 4,-1.79 4,-4C20,7.14 16.41,4 12,4z" />
     <path
         android:fillColor="?attr/colorPrimary"
         android:pathData="M17.5,13c-0.83,0 -1.5,-0.67 -1.5,-1.5c0,-0.83 0.67,-1.5 1.5,-1.5s1.5,0.67 1.5,1.5C19,12.33 18.33,13 17.5,13zM14.5,9C13.67,9 13,8.33 13,7.5C13,6.67 13.67,6 14.5,6S16,6.67 16,7.5C16,8.33 15.33,9 14.5,9zM5,11.5C5,10.67 5.67,10 6.5,10S8,10.67 8,11.5C8,12.33 7.33,13 6.5,13S5,12.33 5,11.5zM11,7.5C11,8.33 10.33,9 9.5,9S8,8.33 8,7.5C8,6.67 8.67,6 9.5,6S11,6.67 11,7.5z" />

app/src/main/res/drawable/zoomin.xml

@@ -0,0 +1,12 @@
+<vector
+android:height="24dp"
+android:viewportHeight="24"
+android:viewportWidth="24"
+android:width="24dp"
+xmlns:android="http://schemas.android.com/apk/res/android" >
+
+<path android:fillColor="?attr/colorOnBackground" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+
+<path android:fillColor="?attr/colorPrimary" android:pathData="M12,10h-2v2H9v-2H7V9h2V7h1v2h2v1z"/>
+
+</vector>

app/src/main/res/layout/activity_stat.xml

@@ -1,15 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:theme="@style/Theme.Beans"
-    tools:context=".activity.StatActivity">
+    tools:context=".activity.StatsActivity">
 
-    <com.github.mikephil.charting.charts.PieChart
+    <com.google.android.material.tabs.TabLayout
-        android:id="@+id/chart"
+        android:id="@+id/tab"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="wrap_content" />
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/pager"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:visibility="gone" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="10dp">
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/group_color"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:layout_marginBottom="2dp"
+            android:paddingStart="56dp"
+            android:text="@string/total"
+            android:textAlignment="textStart"
+            android:textColor="?attr/colorOnPrimary"
+            app:cornerRadius="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="RtlSymmetry" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/name"
+            android:layout_width="wrap_content"
+            android:layout_height="50dp"
+            android:gravity="start|center_vertical"
+            android:paddingStart="20dp"
+            android:paddingEnd="52dp"
+            android:text=""
+            android:textColor="?attr/colorOnPrimary"
+            app:layout_constraintBottom_toBottomOf="@id/group_color"
+            app:layout_constraintEnd_toEndOf="@id/group_color"
+            app:layout_constraintTop_toTopOf="@id/group_color" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/stats"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
 
 </LinearLayout>

app/src/main/res/layout/fragment_about.xml

@@ -12,12 +12,11 @@
         android:orientation="vertical">
 
         <com.google.android.material.imageview.ShapeableImageView
-            android:layout_width="250dp"
+            android:layout_width="300dp"
-            android:layout_height="250dp"
+            android:layout_height="300dp"
-            android:layout_marginTop="40dp"
+            android:layout_marginTop="20dp"
-            android:layout_marginBottom="30dp"
             android:contentDescription="@string/logo"
-            android:src="@mipmap/ic_launcher_round" />
+            android:src="@drawable/ic_launcher_foreground" />
 
         <com.google.android.material.textview.MaterialTextView
             android:layout_width="match_parent"

app/src/main/res/layout/fragment_edit_places_colors.xml

@@ -6,6 +6,12 @@
     android:orientation="vertical"
     android:padding="16dp">
 
+    <TextView
+        android:id="@+id/warning_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="10dp" />
+
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

app/src/main/res/menu/menu_edit.xml

@@ -0,0 +1,13 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="net.helcel.beans.activity.EditActivity" >
+
+    <item
+        android:id="@+id/action_color"
+        android:orderInCategory="100"
+        android:icon="@drawable/color"
+        android:title="@string/action_color"
+        app:showAsAction="ifRoom" />
+
+</menu>

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

@@ -2,5 +2,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>

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

@@ -2,5 +2,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>

app/src/main/res/values/arrays.xml

@@ -15,4 +15,11 @@
         <item>@string/on</item>
         <item>@string/off</item>
     </string-array>
+
+    <string-array name="map_projection">
+        <item>@string/azimuthalequidistant</item>
+        <item>@string/loximuthal</item>
+        <item>@string/mercator</item>
+
+    </string-array>
 </resources>

app/src/main/res/values/colors.xml

@@ -2,12 +2,12 @@
 <resources>
     <color name="black">#FF000000</color>
     <color name="darkgray">#FF0C1D2E</color>
+    <color name="gray">#425F7C</color>
     <color name="lightgray">#FF93A9BE</color>
-    <color name="white">#FFFFFFFF</color>
+    <color name="white">#FFF0F3F7</color>
-
-    <color name="green">#93F531</color>
-    <color name="blue">#3193F5</color>
-    <color name="red">#F53131</color>
 
+    <color name="blue">#0d5cab</color>
+    <color name="green">#B9F57D</color>
+    <color name="red">#F57D7D</color>
 
 </resources>

app/src/main/res/values/en.xml

@@ -5,6 +5,7 @@
     <string name="action_settings">Settings</string>
     <string name="action_stat">Stats</string>
     <string name="action_edit">Edit</string>
+    <string name="action_color">Color</string>
     <string name="key_theme">App theme</string>
     <string name="system">System</string>
     <string name="light">Light</string>
@@ -17,16 +18,21 @@
     <string name="key_regional">Regional</string>
     <string name="about">About</string>
     <string name="beans_is_foss">Beans is free and open source software, licensed under the GNU General Public License (version 3 or later)</string>
-    <string name="beans_repo">Project repository: https://git.helcel.net/helcel/beans\n Feel free to report issues or contribute to the project.</string>
+    <string name="beans_repo">Project repository: https://github.com/helcel-net/beans\n Feel free to report issues or contribute to the project.</string>
     <string name="foss_licenses">Free and open source dependencies and licenses</string>
     <string name="about_beans">About the Beans application</string>
+    <string name="edit_group">Select the group to assign. Long press on a group to edit its name and color.</string>
     <string name="delete_group">Are your sure you want to delete this group and remove all its country mappings?</string>
+    <string name="select_group">Select one group you want to keep. All others will be deleted and its mappings reassigned to the group you choose here.</string>
+    <string name="delete_regions">Are you sure you want to disable regions and reassign all regional mappings to the corresponding countries?</string>
     <string name="add">Add</string>
     <string name="clear">Clear</string>
     <string name="logo">Logo</string>
     <string name="name">Name</string>
     <string name="rate">%1$d/%2$d</string>
+    <string name="rate_with_unit">%1$d / %2$d %3$s</string>
     <string name="percentage">%1$d&#65285;</string>
+    <string name="number_with_unit">%1$d %2$s</string>
     <string name="color_rrggbb">RRGGBB</string>
     <string name="hashtag">#</string>
     <string name="on">On</string>
@@ -34,4 +40,10 @@
     <string name="delete">Delete</string>
     <string name="cancel">Cancel</string>
     <string name="ok">Ok</string>
+    <string name="total">Total</string>
+    <string name="uncategorized">Uncategorized</string>
+    <string name="azimuthalequidistant">Azimuthal Equidistant</string>
+    <string name="mercator">Mercator</string>
+    <string name="loximuthal">Loximuthal</string>
+    <string name="key_projection">Map Projection</string>
 </resources>

app/src/main/res/values/themes.xml

@@ -6,9 +6,27 @@
         <item name="android:panelColorBackground">@color/lightgray</item>
         <item name="android:statusBarColor">?attr/colorPrimary</item>
 
-        <item name="checkboxStyle">@style/Widget.App.CheckBox</item>
+        <item name="checkboxStyle">@style/Theme.Beans.CheckBox</item>
+        <item name="actionBarStyle">@style/Theme.Beans.ActionBar</item>
+        <item name="android:actionOverflowButtonStyle">@style/Theme.Beans.ActionBar.ButtonOverflow</item>
     </style>
 
-    <style name="Widget.App.CheckBox" parent="Widget.Material3.CompoundButton.CheckBox">
+    <style name="Theme.Beans.CheckBox" parent="Widget.Material3.CompoundButton.CheckBox">
+    </style>
+
+    <style name="Theme.Beans.ActionBar" parent="Widget.Material3.ActionBar.Solid">
+        <item name="background">?attr/colorPrimary</item>
+        <item name="titleTextStyle">@style/Theme.Beans.ActionBar.Text</item>
+        <item name="android:tint">@color/white</item>
+        <item name="actionMenuTextColor">@color/white</item>
+        <item name="homeAsUpIndicator">@drawable/back</item>
+    </style>
+
+    <style name="Theme.Beans.ActionBar.Text" parent="TextAppearance.Material3.ActionBar.Title">
+        <item name="android:textColor">@color/white</item>
+    </style>
+
+    <style name="Theme.Beans.ActionBar.ButtonOverflow" parent="Widget.Material3.Search.ActionButton.Overflow">
+        <item name="android:tint">@color/white</item>
     </style>
 </resources>

app/src/main/res/xml/fragment_settings.xml

@@ -4,23 +4,23 @@
     android:theme="@style/Theme.Beans">
 
     <ListPreference
-        app:defaultValue="@string/off"
+        app:defaultValue="@string/system"
         app:enabled="true"
-        app:entries="@array/entries_onoff"
+        app:entries="@array/entries_theme"
-        app:entryValues="@array/entries_onoff"
+        app:entryValues="@array/entries_theme"
-        app:icon="@drawable/edit"
+        app:icon="@drawable/palette"
-        app:key="@string/key_group"
+        app:key="@string/key_theme"
-        app:title="@string/key_group"
+        app:title="@string/key_theme"
         app:useSimpleSummaryProvider="true" />
 
     <ListPreference
-        app:defaultValue="@string/off"
+        app:defaultValue="@string/mercator"
         app:enabled="true"
-        app:entries="@array/entries_onoff"
+        app:entries="@array/map_projection"
-        app:entryValues="@array/entries_onoff"
+        app:entryValues="@array/map_projection"
-        app:icon="@drawable/edit"
+        app:icon="@drawable/map"
-        app:key="@string/key_regional"
+        app:key="@string/key_projection"
-        app:title="@string/key_regional"
+        app:title="@string/key_projection"
         app:useSimpleSummaryProvider="true" />
 
     <ListPreference
@@ -34,18 +34,30 @@
         app:useSimpleSummaryProvider="true" />
 
     <ListPreference
-        app:defaultValue="@string/system"
+        app:defaultValue="@string/off"
         app:enabled="true"
-        app:entries="@array/entries_theme"
+        app:allowDividerAbove="true"
-        app:entryValues="@array/entries_theme"
+        app:entries="@array/entries_onoff"
-        app:icon="@drawable/palette"
+        app:entryValues="@array/entries_onoff"
-        app:key="@string/key_theme"
+        app:icon="@drawable/group"
-        app:title="@string/key_theme"
+        app:key="@string/key_group"
+        app:title="@string/key_group"
+        app:useSimpleSummaryProvider="true" />
+
+    <ListPreference
+        app:defaultValue="@string/off"
+        app:enabled="true"
+        app:entries="@array/entries_onoff"
+        app:entryValues="@array/entries_onoff"
+        app:icon="@drawable/zoomin"
+        app:key="@string/key_regional"
+        app:title="@string/key_regional"
         app:useSimpleSummaryProvider="true" />
 
     <Preference
         android:summary="@string/foss_licenses"
         app:enabled="true"
+        app:allowDividerAbove="true"
         app:icon="@drawable/licenses"
         app:key="@string/licenses"
         app:title="@string/licenses" />

genenum.js

@@ -58,12 +58,25 @@ const groups = {
 var dict0 = {}
 var dict1 = {}
 
-const formatStr = (str)=> str.replace(/(?<!\b\w)\B[A-Z]|,(?!$)/g, match => {
+const formatStr = (str)=> str.replace(/(?<!\b\w\u00E0-\u00FC)\B[A-Z\u00C0-\u00DC]|,(?!$)/g, match => {
   if (match.startsWith(',')) {
       return ', ';
   } else {
       return ' ' + match;
-  }})
+  }}).replace("ofthe "," of the ").replace("dela ", " de la ").replace("delos ", " de los ").replace("áD","á D")
+  .replace("Côted'","Côte d'").replace("leof ","le of ").replace("dde ","d de ").replace("iode ","io de ").replace("àde ","à de ")
+  .replace("yof ","y of ").replace("Andrésy ","Andrés y")
+  .replace("aand ","a and ").replace("iand ", "i and ").replace("tsand ","ts and ").replace("onand ","on and ").replace("reand ", "re and ")
+  .replace("odel ","o del ").replace("adel ", "a del ").replace("ndel ","n del ").replace("zdel ","z del ").replace("falde ", "fal de ").replace("casdel ","cas del ")
+  .replace("odosÓ", "o dos Ó")
+  .replace("Grandedo ", "Grande do ").replace("Grandede ","Grande de ")
+  .replace("Santiagode ","Santiago de ").replace("Joséde ","José de ").replace("Pedrode ","Pedro de ")
+  .replace("andthe "," and the ")
+  .replace("emunicipality", "e municipality").replace("Villede ", "Ville de ")
+  .replace("Valledel ","Valle del ").replace("Valde ","Val de ").replace("Îlesdu ","Îles du ")
+  .replace("sÉ","s É").replace("áO","á O").replace("N C Tof ","NCT of ").replace("N A","NA")
+  .replace("Nortede ", "Norte de ")
+  .trim()
 
 const parse0 = (country) => {
   const filepath = `temp/0/${country}.json`

gensvg.sh

@@ -6,6 +6,7 @@ GADM_VERSION="4.1"
 GADM_BASEPATH="https://geodata.ucdavis.edu/gadm"
 
 mapshaper="./node_modules/mapshaper/bin/mapshaper"
+ATA_URL="https://media.githubusercontent.com/media/wmgeolab/geoBoundaries/905b0baf5f4fb3b9ccf45293647dcacdb2b799d4/releaseData/gbOpen/ATA/ADM0/geoBoundaries-ATA-ADM0_simplified.geojson"
 
 countries=(
   "AFG" "XAD" "ALA" "ALB" "DZA" "ASM" "AND" "AGO" "AIA" "ATG" "ARG" "ARM" "ABW" "AUS" "AUT" "AZE"
@@ -67,7 +68,10 @@ download_1() {
         jq '.features[] |= . + {properties: (.properties | .GID_1 = (.GID_0 + "_" + (
             if .HASC_1 != "NA" then (.HASC_1 | split(".") | .[-1])
             elif .ISO_1 != "NA" then (.ISO_1 | split("-") | .[-1])
-            else (.CC_1)
+            elif .CC_1 != "NA" then (.CC_1)
+            elif .NAME_1 != "NA" then (.NAME_1)
+            elif .GID_1 != "NA" then (.GID_1 | split(".") | .[-1])
+            else .GID_1
             end
             )))}' "$output_dir/gadm41_${1}_1.json"  > "$output_dir/$1.json.1"
         sed -E 's/"[gadm41_]*([A-Z]*)_1"/"\1"/g' "$output_dir/$1.json.1" > "$output_dir/$1.json"
@@ -76,7 +80,7 @@ download_1() {
 
 
 toSVG_0() {
-    local input_files=()
+    local input_files=("ATA")
 
     for country in "${countries[@]}"
     do
@@ -94,7 +98,7 @@ toSVG_0() {
 }
 
 toSVG_1() {
-    input_files=()
+    input_files=("ATA")
 
     for country in "${countries[@]}"
     do
@@ -115,20 +119,26 @@ toSVG_1() {
 toSVG_01() {
     input_files=()
     
+    input_files+=("./temp/1/ATA.json")
     for country in "${countries[@]}"
     do
-        input_file0="./temp/0/${country}.json"
         input_file1="./temp/1/${country}.json"
         if [ -f "$input_file1" ]; then
             input_files+=("$input_file1")
         fi
+    done
+    input_files+=("./temp/0/ATA.json")
+    for country in "${countries[@]}"
+    do
+        input_file0="./temp/0/${country}.json"
         if [ -f "$input_file0" ]; then
             input_files+=("$input_file0")
         fi
     done
 
-    "$mapshaper" -i combine-files ${input_files[@]} -proj webmercator -simplify 0.005 weighted keep-shapes resolution=1200x1200  -o ./app/src/main/assets/mercator01.svg svg-data=GID_0,COUNTRY,GID,NAME id-field=GID
+    "$mapshaper" -i combine-files ${input_files[@]} snap -proj loxim densify -simplify 0.001 weighted keep-shapes -o ./app/src/main/assets/loxim01.svg svg-data=GID_0,COUNTRY,GID,NAME id-field=GID
-    "$mapshaper" -i combine-files ${input_files[@]} -proj aeqd +lat_0=90 -simplify 0.005 weighted keep-shapes resolution=1200x1200 -o ./app/src/main/assets/aeqd01.svg svg-data=GID_0,COUNTRY,GID,NAME id-field=GID
+    "$mapshaper" -i combine-files ${input_files[@]} snap -proj webmercator densify -simplify 0.001 weighted keep-shapes -o ./app/src/main/assets/webmercator01.svg svg-data=GID_0,COUNTRY,GID,NAME id-field=GID
+    "$mapshaper" -i combine-files ${input_files[@]} snap -proj aeqd +lat_0=90 densify -simplify 0.001 weighted keep-shapes -o ./app/src/main/assets/aeqd01.svg svg-data=GID_0,COUNTRY,GID,NAME id-field=GID
 }
 
 do_1() {
@@ -136,15 +146,17 @@ do_1() {
     do
         download_1 "$country"
     done
+    wget -q -O "./temp/1/ATA.json" "$ATA_URL"
 }
 do_0() {
     for country in "${countries[@]}"
     do
         download_0 "$country"
     done
+    wget -q -O "./temp/1/ATA.json" "$ATA_URL"
 }
 # do_0
-do_1
+# do_1
 # toSVG_0
-toSVG_1
+# toSVG_1
 toSVG_01

mapping.js

@@ -0,0 +1,325 @@
+var continents = {
+XAD:"EEE",
+ALA:"EEE",
+ALB:"EEE",
+AND:"EEE",
+AUT:"EEE",
+BLR:"EEE",
+BEL:"EEE",
+BIH:"EEE",
+BGR:"EEE",
+HRV:"EEE",
+CYP:"EEE",
+CZE:"EEE",
+DNK:"EEE",
+EST:"EEE",
+FRO:"EEE",
+FIN:"EEE",
+FRA:"EEE",
+DEU:"EEE",
+GIB:"EEE",
+GRC:"EEE",
+GGY:"EEE",
+HUN:"EEE",
+ISL:"EEE",
+IRL:"EEE",
+IMN:"EEE",
+ITA:"EEE",
+JEY:"EEE",
+KAZ:"EEE",
+XKO:"EEE",
+LVA:"EEE",
+LIE:"EEE",
+LTU:"EEE",
+LUX:"EEE",
+MLT:"EEE",
+MDA:"EEE",
+MCO:"EEE",
+MNE:"EEE",
+NLD:"EEE",
+MKD:"EEE",
+NOR:"EEE",
+POL:"EEE",
+PRT:"EEE",
+ROU:"EEE",
+RUS:"EEE",
+SMR:"EEE",
+SRB:"EEE",
+SVK:"EEE",
+SVN:"EEE",
+ESP:"EEE",
+SJM:"EEE",
+SWE:"EEE",
+CHE:"EEE",
+UKR:"EEE",
+GBR:"EEE",
+VAT:"EEE",
+
+AFG:"ABB",
+ARM:"ABB",
+AZE:"ABB",
+BHR:"ABB",
+BGD:"ABB",
+BTN:"ABB",
+IOT:"ABB",
+BRN:"ABB",
+KHM:"ABB",
+CCK:"ABB",
+CHN:"ABB",
+CXR:"ABB",
+GEO:"ABB",
+HKG:"ABB",
+IND:"ABB",
+IDN:"ABB",
+IRN:"ABB",
+IRQ:"ABB",
+ISR:"ABB",
+JPN:"ABB",
+JOR:"ABB",
+KWT:"ABB",
+KGZ:"ABB",
+LAO:"ABB",
+LBN:"ABB",
+MAC:"ABB",
+MYS:"ABB",
+MDV:"ABB",
+MNG:"ABB",
+MMR:"ABB",
+NPL:"ABB",
+PRK:"ABB",
+OMN:"ABB",
+PAK:"ABB",
+PSE:"ABB",
+PHL:"ABB",
+QAT:"ABB",
+SAU:"ABB",
+SGP:"ABB",
+KOR:"ABB",
+LKA:"ABB",
+SYR:"ABB",
+TWN:"ABB",
+TJK:"ABB",
+THA:"ABB",
+TLS:"ABB",
+TUR:"ABB",
+TKM:"ABB",
+ARE:"ABB",
+UZB:"ABB",
+VNM:"ABB",
+YEM:"ABB",
+ZNC:"ABB",
+
+DZA:"FFF",
+AGO:"FFF",
+BDI:"FFF",
+BEN:"FFF",
+BWA:"FFF",
+BFA:"FFF",
+BDI:"FFF",
+CPV:"FFF",
+CMR:"FFF",
+CAF:"FFF",
+TCD:"FFF",
+COM:"FFF",
+COG:"FFF",
+COD:"FFF",
+CIV:"FFF",
+DJI:"FFF",
+EGY:"FFF",
+GNQ:"FFF",
+ERI:"FFF",
+ETH:"FFF",
+ATF:"FFF",
+GAB:"FFF",
+GMB:"FFF",
+GHA:"FFF",
+GIN:"FFF",
+GNB:"FFF",
+KEN:"FFF",
+LSO:"FFF",
+LBR:"FFF",
+LBY:"FFF",
+MDG:"FFF",
+MWI:"FFF",
+MLI:"FFF",
+MRT:"FFF",
+MUS:"FFF",
+MYT:"FFF",
+MAR:"FFF",
+MOZ:"FFF",
+NAM:"FFF",
+NER:"FFF",
+NGA:"FFF",
+COD:"FFF",
+REU:"FFF",
+RWA:"FFF",
+STP:"FFF",
+SEN:"FFF",
+SYC:"FFF",
+SLE:"FFF",
+SOM:"FFF",
+ZAF:"FFF",
+SSD:"FFF",
+SHN:"FFF",
+SDN:"FFF",
+SWZ:"FFF",
+TZA:"FFF",
+TGO:"FFF",
+TUN:"FFF",
+UGA:"FFF",
+COD:"FFF",
+ZMB:"FFF",
+ZWE:"FFF",
+ESH:"FFF",
+
+ABW:"NNN",
+AIA:"NNN",
+ATG:"NNN",
+BHS:"NNN",
+BRB:"NNN",
+BLZ:"NNN",
+BMU:"NNN",
+BES:"NNN",
+VGB:"NNN",
+CAN:"NNN",
+CYM:"NNN",
+XCL:"NNN",
+CRI:"NNN",
+CUB:"NNN",
+CUW:"NNN",
+DMA:"NNN",
+DOM:"NNN",
+SLV:"NNN",
+GRL:"NNN",
+GRD:"NNN",
+GLP:"NNN",
+GTM:"NNN",
+HTI:"NNN",
+HND:"NNN",
+JAM:"NNN",
+MTQ:"NNN",
+MEX:"NNN",
+MSR:"NNN",
+ANT:"NNN",
+CUW:"NNN",
+NIC:"NNN",
+PAN:"NNN",
+PRI:"NNN",
+BLM:"NNN",
+KNA:"NNN",
+LCA:"NNN",
+MAF:"NNN",
+SPM:"NNN",
+VCT:"NNN",
+SXM:"NNN",
+TTO:"NNN",
+TCA:"NNN",
+USA:"NNN",
+UMI:"NNN",
+VIR:"NNN",
+
+ARG:"SRR",
+BOL:"SRR",
+BRA:"SRR",
+CHL:"SRR",
+COL:"SRR",
+ECU:"SRR",
+FLK:"SRR",
+GUF:"SRR",
+GUY:"SRR",
+PRY:"SRR",
+PER:"SRR",
+SUR:"SRR",
+URY:"SRR",
+VEN:"SRR",
+
+ASM:"UUU",
+AUS:"UUU",
+COK:"UUU",
+FJI:"UUU",
+PYF:"UUU",
+GUM:"UUU",
+KIR:"UUU",
+MHL:"UUU",
+FSM:"UUU",
+NRU:"UUU",
+NCL:"UUU",
+NZL:"UUU",
+NIU:"UUU",
+NFK:"UUU",
+MNP:"UUU",
+PLW:"UUU",
+PNG:"UUU",
+PCN:"UUU",
+WSM:"UUU",
+SLB:"UUU",
+TKL:"UUU",
+TON:"UUU",
+TUV:"UUU",
+VUT:"UUU",
+WLF:"UUU",
+
+ATA:"XXX",
+BVT:"XXX",
+HMD:"XXX",
+SGS:"XXX",
+}
+
+import fs from "fs"
+import {JSDOM} from "jsdom"
+
+function groupByContinent(svgFilePath) {
+    // Read the SVG file
+    fs.readFile(svgFilePath, 'utf-8', (err, data) => {
+        if (err) {
+            console.error('Error reading SVG file:', err);
+            return;
+        }
+
+        // Create a virtual DOM with JSDOM
+        const dom = new JSDOM(data);
+        const document = dom.window.document;
+
+        // Select the root <svg> element
+        const svgElement = document.querySelector('svg');
+
+        // Group <g> elements representing countries by continent
+        const world = {}; // Renamed continents object to 'world'
+        svgElement.querySelectorAll('g').forEach(countryGroup => {
+            const countryId = countryGroup.getAttribute('id');
+            if (countryId!= null){
+                const continentId = continents[countryId.replace(/\d/g, "")] || "XXX"; // Remove numbers from country ID to get continent ID
+                if (!world[continentId]) {
+                    world[continentId] = document.createElementNS('http://www.w3.org/2000/svg', 'g');
+                    world[continentId].setAttribute('id', continentId);
+                }
+                world[continentId].innerHTML += countryGroup.outerHTML;
+            }else{
+
+            console.log(countryId,countryGroup.outerHTML)
+            }
+        });
+
+        // Create new <g> elements for each continent
+        svgElement.innerHTML = '';
+        for (const continentId in world) {
+            svgElement.appendChild(world[continentId]);
+        }
+
+        // Output the modified SVG
+        fs.writeFile(svgFilePath, svgElement.outerHTML, 'utf-8', err => {
+            if (err) {
+                console.error('Error writing to SVG file:', err);
+                return;
+            }
+            console.log('SVG file updated successfully.');
+        });
+    });
+}
+
+
+// Example usage:
+const svgFileBasePath = "./app/src/main/assets/" ;
+groupByContinent(svgFileBasePath+ "webmercator01.svg");
+groupByContinent(svgFileBasePath+ "aeqd01.svg");
+groupByContinent(svgFileBasePath+ "loxim01.svg");

metadata/en-US/full_description.txt

@@ -1 +1,11 @@
-<p><i>Beans</i> is a scratchmap of the world for android. You can color in a single or many custom colors. You can color on a country or state basis.</p>
+Beans is a scratchmap of the world for Android.
+
+Keep track of your discovery of the world on a colorful visual map.
+
+• Color a map of places based on custom labels
+• Country/State based coloring
+• Single/Multi color modes
+• Different map projections available
+• Small & Fast
+• Statistics (WIP)
+• 100% Free and Open Source software, with no proprietary dependencies

metadata/en-US/title.txt

@@ -0,0 +1 @@
+Beans

package.json

@@ -1,13 +1,8 @@
 {
   "dependencies": {
     "@turf/area": "^6.5.0",
-    "@turf/concave": "^6.5.0",
-    "@turf/convex": "^6.5.0",
-    "@turf/projection": "^6.5.0",
-    "@turf/simplify": "^6.5.0",
-    "@turf/truncate": "^6.5.0",
     "@turf/turf": "^6.5.0",
-    "geojson2svg": "^2.0.1",
+    "jsdom": "^24.0.0",
     "mapshaper": "^0.6.79"
   },
   "type": "module"

yarn.lock

@@ -62,15 +62,15 @@ __metadata:
   linkType: hard
 
 "@npmcli/agent@npm:^2.0.0":
-  version: 2.2.1
+  version: 2.2.2
-  resolution: "@npmcli/agent@npm:2.2.1"
+  resolution: "@npmcli/agent@npm:2.2.2"
   dependencies:
     agent-base: ^7.1.0
     http-proxy-agent: ^7.0.0
     https-proxy-agent: ^7.0.1
     lru-cache: ^10.0.1
-    socks-proxy-agent: ^8.0.1
+    socks-proxy-agent: ^8.0.3
-  checksum: c69aca42dbba393f517bc5777ee872d38dc98ea0e5e93c1f6d62b82b8fecdc177a57ea045f07dda1a770c592384b2dd92a5e79e21e2a7cf51c9159466a8f9c9b
+  checksum: 67de7b88cc627a79743c88bab35e023e23daf13831a8aa4e15f998b92f5507b644d8ffc3788afc8e64423c612e0785a6a92b74782ce368f49a6746084b50d874
   languageName: node
   linkType: hard
 
@@ -1483,11 +1483,11 @@ __metadata:
   linkType: hard
 
 "@types/node@npm:*":
-  version: 20.12.2
+  version: 20.12.7
-  resolution: "@types/node@npm:20.12.2"
+  resolution: "@types/node@npm:20.12.7"
   dependencies:
     undici-types: ~5.26.4
-  checksum: 3242ab04fe69ae32a2da29a7a2fce41fccb370bc1189de43d2dfbb491bd3253d3ee2070cbb5613061148e4862fdaa9cf62722c43128ce5c7d33fe83750956613
+  checksum: 7cc979f7e2ca9a339ec71318c3901b9978555257929ef3666987f3e447123bc6dc92afcc89f6347e09e07d602fde7d51bcddea626c23aa2bb74aeaacfd1e1686
   languageName: node
   linkType: hard
 
@@ -1696,7 +1696,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"combined-stream@npm:^1.0.6":
+"combined-stream@npm:^1.0.6, combined-stream@npm:^1.0.8":
   version: 1.0.8
   resolution: "combined-stream@npm:1.0.8"
   dependencies:
@@ -1771,6 +1771,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cssstyle@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "cssstyle@npm:4.0.1"
+  dependencies:
+    rrweb-cssom: ^0.6.0
+  checksum: 4b2fdd81c565b1f8f24a792f85d3a19269a2f201e731c3fe3531d7fc78b4bc6b31906ed17aba7edba7b1c8b7672574fc6c09fe925556da3a9a9458dbf8c4fa22
+  languageName: node
+  linkType: hard
+
 "d3-array@npm:1":
   version: 1.2.4
   resolution: "d3-array@npm:1.2.4"
@@ -1820,6 +1829,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"data-urls@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "data-urls@npm:5.0.0"
+  dependencies:
+    whatwg-mimetype: ^4.0.0
+    whatwg-url: ^14.0.0
+  checksum: 5c40568c31b02641a70204ff233bc4e42d33717485d074244a98661e5f2a1e80e38fe05a5755dfaf2ee549f2ab509d6a3af2a85f4b2ad2c984e5d176695eaf46
+  languageName: node
+  linkType: hard
+
 "debug@npm:4, debug@npm:^4.3.4":
   version: 4.3.4
   resolution: "debug@npm:4.3.4"
@@ -1832,6 +1851,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"decimal.js@npm:^10.4.3":
+  version: 10.4.3
+  resolution: "decimal.js@npm:10.4.3"
+  checksum: 796404dcfa9d1dbfdc48870229d57f788b48c21c603c3f6554a1c17c10195fc1024de338b0cf9e1efe0c7c167eeb18f04548979bcc5fdfabebb7cc0ae3287bae
+  languageName: node
+  linkType: hard
+
 "deep-equal@npm:1.x, deep-equal@npm:^1.0.0":
   version: 1.1.2
   resolution: "deep-equal@npm:1.1.2"
@@ -1935,6 +1961,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"entities@npm:^4.4.0":
+  version: 4.5.0
+  resolution: "entities@npm:4.5.0"
+  checksum: 853f8ebd5b425d350bffa97dd6958143179a5938352ccae092c62d1267c4e392a039be1bae7d51b6e4ffad25f51f9617531fedf5237f15df302ccfb452cbf2d7
+  languageName: node
+  linkType: hard
+
 "env-paths@npm:^2.2.0":
   version: 2.2.1
   resolution: "env-paths@npm:2.2.1"
@@ -1972,13 +2005,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"extend@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "extend@npm:3.0.2"
-  checksum: a50a8309ca65ea5d426382ff09f33586527882cf532931cb08ca786ea3146c0553310bda688710ff61d7668eba9f96b923fe1420cdf56a2c3eaf30fcab87b515
-  languageName: node
-  linkType: hard
-
 "fflate@npm:^0.7.4":
   version: 0.7.4
   resolution: "fflate@npm:0.7.4"
@@ -2023,6 +2049,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"form-data@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "form-data@npm:4.0.0"
+  dependencies:
+    asynckit: ^0.4.0
+    combined-stream: ^1.0.8
+    mime-types: ^2.1.12
+  checksum: 01135bf8675f9d5c61ff18e2e2932f719ca4de964e3be90ef4c36aacfc7b9cb2fceb5eca0b7e0190e3383fe51c5b37f4cb80b62ca06a99aaabfcfd6ac7c9328c
+  languageName: node
+  linkType: hard
+
 "fs-minipass@npm:^2.0.0":
   version: 2.1.0
   resolution: "fs-minipass@npm:2.1.0"
@@ -2062,13 +2099,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"geojson-bbox@npm:^0.0.1":
-  version: 0.0.1
-  resolution: "geojson-bbox@npm:0.0.1"
-  checksum: 4bacdef0d3465c28d60ccbd08671c95ba97bb462acfdfb958097800c15de4a69db31fa9b39b8af13da76d5fab62a558c5850877730c22d8497565e077d501b6e
-  languageName: node
-  linkType: hard
-
 "geojson-equality@npm:0.1.6":
   version: 0.1.6
   resolution: "geojson-equality@npm:0.1.6"
@@ -2091,17 +2121,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"geojson2svg@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "geojson2svg@npm:2.0.1"
-  dependencies:
-    extend: ^3.0.2
-    geojson-bbox: ^0.0.1
-    multigeojson: ~0.0.1
-  checksum: 742eb45407f1bef860aacc51df3e32d0ede1ae23125e62c199f41338166f0744a403662ea90bf6e0f83e5acc977d1bbb536c59e31f7b02cd4b0a56832a50eeba
-  languageName: node
-  linkType: hard
-
 "geokdbush@npm:^1.1.0":
   version: 1.1.0
   resolution: "geokdbush@npm:1.1.0"
@@ -2203,6 +2222,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"html-encoding-sniffer@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "html-encoding-sniffer@npm:4.0.0"
+  dependencies:
+    whatwg-encoding: ^3.1.1
+  checksum: 3339b71dab2723f3159a56acf541ae90a408ce2d11169f00fe7e0c4663d31d6398c8a4408b504b4eec157444e47b084df09b3cb039c816660f0dd04846b8957d
+  languageName: node
+  linkType: hard
+
 "http-basic@npm:^6.0.0":
   version: 6.0.0
   resolution: "http-basic@npm:6.0.0"
@@ -2243,7 +2271,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"https-proxy-agent@npm:^7.0.1":
+"https-proxy-agent@npm:^7.0.1, https-proxy-agent@npm:^7.0.2":
   version: 7.0.4
   resolution: "https-proxy-agent@npm:7.0.4"
   dependencies:
@@ -2253,7 +2281,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"iconv-lite@npm:^0.6.2, iconv-lite@npm:^0.6.3":
+"iconv-lite@npm:0.6.3, iconv-lite@npm:^0.6.2, iconv-lite@npm:^0.6.3":
   version: 0.6.3
   resolution: "iconv-lite@npm:0.6.3"
   dependencies:
@@ -2333,6 +2361,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-potential-custom-element-name@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "is-potential-custom-element-name@npm:1.0.1"
+  checksum: ced7bbbb6433a5b684af581872afe0e1767e2d1146b2207ca0068a648fb5cab9d898495d1ac0583524faaf24ca98176a7d9876363097c2d14fee6dd324f3a1ab
+  languageName: node
+  linkType: hard
+
 "is-regex@npm:^1.1.4":
   version: 1.1.4
   resolution: "is-regex@npm:1.1.4"
@@ -2391,6 +2426,40 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jsdom@npm:^24.0.0":
+  version: 24.0.0
+  resolution: "jsdom@npm:24.0.0"
+  dependencies:
+    cssstyle: ^4.0.1
+    data-urls: ^5.0.0
+    decimal.js: ^10.4.3
+    form-data: ^4.0.0
+    html-encoding-sniffer: ^4.0.0
+    http-proxy-agent: ^7.0.0
+    https-proxy-agent: ^7.0.2
+    is-potential-custom-element-name: ^1.0.1
+    nwsapi: ^2.2.7
+    parse5: ^7.1.2
+    rrweb-cssom: ^0.6.0
+    saxes: ^6.0.0
+    symbol-tree: ^3.2.4
+    tough-cookie: ^4.1.3
+    w3c-xmlserializer: ^5.0.0
+    webidl-conversions: ^7.0.0
+    whatwg-encoding: ^3.1.1
+    whatwg-mimetype: ^4.0.0
+    whatwg-url: ^14.0.0
+    ws: ^8.16.0
+    xml-name-validator: ^5.0.0
+  peerDependencies:
+    canvas: ^2.11.2
+  peerDependenciesMeta:
+    canvas:
+      optional: true
+  checksum: 180cf672c1f5e4375fd831b6990c453b4c22b540619abe7a0a3ed0d18eca1171dea9f25739bc06dfea26d1c0d71c7ac26e62fc9a2d9b1657003fc8fd1bf6f9f4
+  languageName: node
+  linkType: hard
+
 "kdbush@npm:^3.0.0":
   version: 3.0.0
   resolution: "kdbush@npm:3.0.0"
@@ -2443,8 +2512,8 @@ __metadata:
   linkType: hard
 
 "mapshaper@npm:^0.6.79":
-  version: 0.6.79
+  version: 0.6.88
-  resolution: "mapshaper@npm:0.6.79"
+  resolution: "mapshaper@npm:0.6.88"
   dependencies:
     "@placemarkio/tokml": ^0.3.3
     "@tmcw/togeojson": ^5.6.0
@@ -2462,7 +2531,7 @@ __metadata:
     iconv-lite: ^0.6.3
     idb-keyval: ^6.2.0
     kdbush: ^3.0.0
-    mproj: 0.0.37
+    mproj: 0.0.38
     msgpackr: ^1.10.1
     opn: ^5.3.0
     rw: ~1.3.3
@@ -2472,7 +2541,7 @@ __metadata:
     mapshaper: bin/mapshaper
     mapshaper-gui: bin/mapshaper-gui
     mapshaper-xl: bin/mapshaper-xl
-  checksum: 0a33bd50927e0e7597c066a7dfb035b0b4af6dea28e8823595e464db577d6c537d99cf08e9ae5ff2e074fdae2323271d4a25be600efc3b0092de4fc2b004fd16
+  checksum: c33b651d242c5ae1f6e23f54f615f8370b2d3d8a5cd6f5eca68cdc773f7abcc30dad2095a44d85a1a3f85d358f91aff29cacdf84ac054ec2929924f9c36f16cb
   languageName: node
   linkType: hard
 
@@ -2594,16 +2663,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mproj@npm:0.0.37":
+"mproj@npm:0.0.38":
-  version: 0.0.37
+  version: 0.0.38
-  resolution: "mproj@npm:0.0.37"
+  resolution: "mproj@npm:0.0.38"
   dependencies:
     geographiclib: 1.48.0
     rw: ~1.3.2
   bin:
     mcs2cs: bin/mcs2cs
     mproj: bin/mproj
-  checksum: 0bcd4f2ce14e88035f9f517683dd86a15c8c5a04579e1bb087a287cddb319217bcf6670229ce51a64372f111b45755691794e78f510ff36ab98eabd51494cc28
+  checksum: e8ecf6b26602ba7ccf6ac3551f32a3cd8d5c1271a2b076a5bf45b8bc09862b5a0ff9b7d58978c0a3ee2d212ac84deac847048bb9db5732ad0d35e5bda509ea54
   languageName: node
   linkType: hard
 
@@ -2657,13 +2726,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"multigeojson@npm:~0.0.1":
-  version: 0.0.1
-  resolution: "multigeojson@npm:0.0.1"
-  checksum: 25211a4e7cf561f28dd60aec93a39a35535372817e4540cbf18449f20750d789a510dc5042921a8126b21a830c482381ffdc5674ad82a31e67e01bf508121b34
-  languageName: node
-  linkType: hard
-
 "negotiator@npm:^0.6.3":
   version: 0.6.3
   resolution: "negotiator@npm:0.6.3"
@@ -2713,6 +2775,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"nwsapi@npm:^2.2.7":
+  version: 2.2.7
+  resolution: "nwsapi@npm:2.2.7"
+  checksum: cab25f7983acec7e23490fec3ef7be608041b460504229770e3bfcf9977c41d6fe58f518994d3bd9aa3a101f501089a3d4a63536f4ff8ae4b8c4ca23bdbfda4e
+  languageName: node
+  linkType: hard
+
 "object-assign@npm:*":
   version: 4.1.1
   resolution: "object-assign@npm:4.1.1"
@@ -2769,6 +2838,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"parse5@npm:^7.1.2":
+  version: 7.1.2
+  resolution: "parse5@npm:7.1.2"
+  dependencies:
+    entities: ^4.4.0
+  checksum: 59465dd05eb4c5ec87b76173d1c596e152a10e290b7abcda1aecf0f33be49646ea74840c69af975d7887543ea45564801736356c568d6b5e71792fd0f4055713
+  languageName: node
+  linkType: hard
+
 "path-key@npm:^3.1.0":
   version: 3.1.1
   resolution: "path-key@npm:3.1.1"
@@ -2836,6 +2914,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"psl@npm:^1.1.33":
+  version: 1.9.0
+  resolution: "psl@npm:1.9.0"
+  checksum: 20c4277f640c93d393130673f392618e9a8044c6c7bf61c53917a0fddb4952790f5f362c6c730a9c32b124813e173733f9895add8d26f566ed0ea0654b2e711d
+  languageName: node
+  linkType: hard
+
+"punycode@npm:^2.1.1, punycode@npm:^2.3.1":
+  version: 2.3.1
+  resolution: "punycode@npm:2.3.1"
+  checksum: bb0a0ceedca4c3c57a9b981b90601579058903c62be23c5e8e843d2c2d4148a3ecf029d5133486fb0e1822b098ba8bba09e89d6b21742d02fa26bda6441a6fb2
+  languageName: node
+  linkType: hard
+
 "qs@npm:^6.4.0":
   version: 6.12.0
   resolution: "qs@npm:6.12.0"
@@ -2845,6 +2937,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"querystringify@npm:^2.1.1":
+  version: 2.2.0
+  resolution: "querystringify@npm:2.2.0"
+  checksum: 5641ea231bad7ef6d64d9998faca95611ed4b11c2591a8cae741e178a974f6a8e0ebde008475259abe1621cb15e692404e6b6626e927f7b849d5c09392604b15
+  languageName: node
+  linkType: hard
+
 "quickselect@npm:^1.0.1":
   version: 1.1.1
   resolution: "quickselect@npm:1.1.1"
@@ -2904,6 +3003,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"requires-port@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "requires-port@npm:1.0.0"
+  checksum: eee0e303adffb69be55d1a214e415cf42b7441ae858c76dfc5353148644f6fd6e698926fc4643f510d5c126d12a705e7c8ed7e38061113bdf37547ab356797ff
+  languageName: node
+  linkType: hard
+
 "retry@npm:^0.12.0":
   version: 0.12.0
   resolution: "retry@npm:0.12.0"
@@ -2930,17 +3036,19 @@ __metadata:
   resolution: "root-workspace-0b6124@workspace:."
   dependencies:
     "@turf/area": ^6.5.0
-    "@turf/concave": ^6.5.0
-    "@turf/convex": ^6.5.0
-    "@turf/projection": ^6.5.0
-    "@turf/simplify": ^6.5.0
-    "@turf/truncate": ^6.5.0
     "@turf/turf": ^6.5.0
-    geojson2svg: ^2.0.1
+    jsdom: ^24.0.0
     mapshaper: ^0.6.79
   languageName: unknown
   linkType: soft
 
+"rrweb-cssom@npm:^0.6.0":
+  version: 0.6.0
+  resolution: "rrweb-cssom@npm:0.6.0"
+  checksum: 182312f6e4f41d18230ccc34f14263bc8e8a6b9d30ee3ec0d2d8e643c6f27964cd7a8d638d4a00e988d93e8dc55369f4ab5a473ccfeff7a8bab95b36d2b5499c
+  languageName: node
+  linkType: hard
+
 "rw@npm:~1.3.2, rw@npm:~1.3.3":
   version: 1.3.3
   resolution: "rw@npm:1.3.3"
@@ -2962,6 +3070,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"saxes@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "saxes@npm:6.0.0"
+  dependencies:
+    xmlchars: ^2.2.0
+  checksum: d3fa3e2aaf6c65ed52ee993aff1891fc47d5e47d515164b5449cbf5da2cbdc396137e55590472e64c5c436c14ae64a8a03c29b9e7389fc6f14035cf4e982ef3b
+  languageName: node
+  linkType: hard
+
 "semver@npm:^7.3.5":
   version: 7.6.0
   resolution: "semver@npm:7.6.0"
@@ -3048,7 +3165,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"socks-proxy-agent@npm:^8.0.1":
+"socks-proxy-agent@npm:^8.0.3":
   version: 8.0.3
   resolution: "socks-proxy-agent@npm:8.0.3"
   dependencies:
@@ -3060,12 +3177,12 @@ __metadata:
   linkType: hard
 
 "socks@npm:^2.7.1":
-  version: 2.8.1
+  version: 2.8.3
-  resolution: "socks@npm:2.8.1"
+  resolution: "socks@npm:2.8.3"
   dependencies:
     ip-address: ^9.0.5
     smart-buffer: ^4.2.0
-  checksum: 29586d42e9c36c5016632b2bcb6595e3adfbcb694b3a652c51bc8741b079c5ec37bdd5675a1a89a1620078c8137208294991fabb50786f92d47759a725b2b62e
+  checksum: 7a6b7f6eedf7482b9e4597d9a20e09505824208006ea8f2c49b71657427f3c137ca2ae662089baa73e1971c62322d535d9d0cf1c9235cf6f55e315c18203eadd
   languageName: node
   linkType: hard
 
@@ -3141,6 +3258,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"symbol-tree@npm:^3.2.4":
+  version: 3.2.4
+  resolution: "symbol-tree@npm:3.2.4"
+  checksum: 6e8fc7e1486b8b54bea91199d9535bb72f10842e40c79e882fc94fb7b14b89866adf2fd79efa5ebb5b658bc07fb459ccce5ac0e99ef3d72f474e74aaf284029d
+  languageName: node
+  linkType: hard
+
 "sync-request@npm:5.0.0":
   version: 5.0.0
   resolution: "sync-request@npm:5.0.0"
@@ -3232,6 +3356,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tough-cookie@npm:^4.1.3":
+  version: 4.1.3
+  resolution: "tough-cookie@npm:4.1.3"
+  dependencies:
+    psl: ^1.1.33
+    punycode: ^2.1.1
+    universalify: ^0.2.0
+    url-parse: ^1.5.3
+  checksum: c9226afff36492a52118432611af083d1d8493a53ff41ec4ea48e5b583aec744b989e4280bcf476c910ec1525a89a4a0f1cae81c08b18fb2ec3a9b3a72b91dcc
+  languageName: node
+  linkType: hard
+
+"tr46@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "tr46@npm:5.0.0"
+  dependencies:
+    punycode: ^2.3.1
+  checksum: 8d8b021f8e17675ebf9e672c224b6b6cfdb0d5b92141349e9665c14a2501c54a298d11264bbb0b17b447581e1e83d4fc3c038c929f3d210e3964d4be47460288
+  languageName: node
+  linkType: hard
+
 "tsscmp@npm:1.0.6":
   version: 1.0.6
   resolution: "tsscmp@npm:1.0.6"
@@ -3278,6 +3423,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"universalify@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "universalify@npm:0.2.0"
+  checksum: e86134cb12919d177c2353196a4cc09981524ee87abf621f7bc8d249dbbbebaec5e7d1314b96061497981350df786e4c5128dbf442eba104d6e765bc260678b5
+  languageName: node
+  linkType: hard
+
+"url-parse@npm:^1.5.3":
+  version: 1.5.10
+  resolution: "url-parse@npm:1.5.10"
+  dependencies:
+    querystringify: ^2.1.1
+    requires-port: ^1.0.0
+  checksum: fbdba6b1d83336aca2216bbdc38ba658d9cfb8fc7f665eb8b17852de638ff7d1a162c198a8e4ed66001ddbf6c9888d41e4798912c62b4fd777a31657989f7bdf
+  languageName: node
+  linkType: hard
+
 "util-deprecate@npm:~1.0.1":
   version: 1.0.2
   resolution: "util-deprecate@npm:1.0.2"
@@ -3285,6 +3447,48 @@ __metadata:
   languageName: node
   linkType: hard
 
+"w3c-xmlserializer@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "w3c-xmlserializer@npm:5.0.0"
+  dependencies:
+    xml-name-validator: ^5.0.0
+  checksum: 593acc1fdab3f3207ec39d851e6df0f3fa41a36b5809b0ace364c7a6d92e351938c53424a7618ce8e0fbaffee8be2e8e070a5734d05ee54666a8bdf1a376cc40
+  languageName: node
+  linkType: hard
+
+"webidl-conversions@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "webidl-conversions@npm:7.0.0"
+  checksum: f05588567a2a76428515333eff87200fae6c83c3948a7482ebb109562971e77ef6dc49749afa58abb993391227c5697b3ecca52018793e0cb4620a48f10bd21b
+  languageName: node
+  linkType: hard
+
+"whatwg-encoding@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "whatwg-encoding@npm:3.1.1"
+  dependencies:
+    iconv-lite: 0.6.3
+  checksum: f75a61422421d991e4aec775645705beaf99a16a88294d68404866f65e92441698a4f5b9fa11dd609017b132d7b286c3c1534e2de5b3e800333856325b549e3c
+  languageName: node
+  linkType: hard
+
+"whatwg-mimetype@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "whatwg-mimetype@npm:4.0.0"
+  checksum: f97edd4b4ee7e46a379f3fb0e745de29fe8b839307cc774300fd49059fcdd560d38cb8fe21eae5575b8f39b022f23477cc66e40b0355c2851ce84760339cef30
+  languageName: node
+  linkType: hard
+
+"whatwg-url@npm:^14.0.0":
+  version: 14.0.0
+  resolution: "whatwg-url@npm:14.0.0"
+  dependencies:
+    tr46: ^5.0.0
+    webidl-conversions: ^7.0.0
+  checksum: 4b5887e50f786583bead70916413e67a381d2126899b9eb5c67ce664bba1e7ec07cdff791404581ce73c6190d83c359c9ca1d50711631217905db3877dec075c
+  languageName: node
+  linkType: hard
+
 "which@npm:^2.0.1":
   version: 2.0.2
   resolution: "which@npm:2.0.2"
@@ -3329,6 +3533,35 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ws@npm:^8.16.0":
+  version: 8.16.0
+  resolution: "ws@npm:8.16.0"
+  peerDependencies:
+    bufferutil: ^4.0.1
+    utf-8-validate: ">=5.0.2"
+  peerDependenciesMeta:
+    bufferutil:
+      optional: true
+    utf-8-validate:
+      optional: true
+  checksum: feb3eecd2bae82fa8a8beef800290ce437d8b8063bdc69712725f21aef77c49cb2ff45c6e5e7fce622248f9c7abaee506bae0a9064067ffd6935460c7357321b
+  languageName: node
+  linkType: hard
+
+"xml-name-validator@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "xml-name-validator@npm:5.0.0"
+  checksum: 86effcc7026f437701252fcc308b877b4bc045989049cfc79b0cc112cb365cf7b009f4041fab9fb7cd1795498722c3e9fe9651afc66dfa794c16628a639a4c45
+  languageName: node
+  linkType: hard
+
+"xmlchars@npm:^2.2.0":
+  version: 2.2.0
+  resolution: "xmlchars@npm:2.2.0"
+  checksum: 8c70ac94070ccca03f47a81fcce3b271bd1f37a591bf5424e787ae313fcb9c212f5f6786e1fa82076a2c632c0141552babcd85698c437506dfa6ae2d58723062
+  languageName: node
+  linkType: hard
+
 "yallist@npm:^4.0.0":
   version: 4.0.0
   resolution: "yallist@npm:4.0.0"