iOS 2.7.2 - Icons!

.editorconfig

@@ -0,0 +1,18 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.{json,yml,yaml}]
+indent_size = 2
+
+[Makefile]
+indent_style = tab

.gitattributes

@@ -0,0 +1,77 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Source code files
+*.swift text eol=lf
+*.kt text eol=lf
+*.kts text eol=lf
+*.java text eol=lf
+*.go text eol=lf
+*.py text eol=lf
+*.ts text eol=lf
+*.tsx text eol=lf
+*.js text eol=lf
+*.jsx text eol=lf
+*.mjs text eol=lf
+*.cjs text eol=lf
+
+# Configuration files
+*.json text eol=lf
+*.yml text eol=lf
+*.yaml text eol=lf
+*.toml text eol=lf
+*.xml text eol=lf
+*.plist text eol=lf
+*.properties text eol=lf
+*.gradle text eol=lf
+*.md text eol=lf
+
+# Shell scripts
+*.sh text eol=lf
+*.bash text eol=lf
+*.zsh text eol=lf
+
+# Windows batch files
+*.bat text eol=crlf
+*.cmd text eol=crlf
+
+# Binary files
+*.png binary
+*.jpg binary
+*.jpeg binary
+*.gif binary
+*.ico binary
+*.webp binary
+*.pdf binary
+*.zip binary
+*.tar binary
+*.gz binary
+*.jar binary
+*.aar binary
+*.apk binary
+*.ipa binary
+*.xcassets binary
+*.ttf binary
+*.otf binary
+*.woff binary
+*.woff2 binary
+*.eot binary
+
+# Xcode files
+*.pbxproj merge=union
+*.xcworkspacedata text eol=lf
+*.xcscheme text eol=lf
+
+# Gradle wrapper
+gradlew text eol=lf
+gradlew.bat text eol=crlf
+gradle-wrapper.jar binary
+
+# Lock files
+*.lock text -diff
+package-lock.json text -diff
+pnpm-lock.yaml text -diff
+
+# Documentation
+LICENSE text eol=lf
+README.md text eol=lf

.gitignore

@@ -9,6 +9,11 @@ local.properties
 # Log/OS Files
 *.log
 .DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+Thumbs.db
 
 # Android Studio generated files and folders
 captures/
@@ -34,3 +39,44 @@ google-services.json
 
 # Android Profiling
 *.hprof
+
+# iOS/Xcode
+ios/build/
+ios/DerivedData/
+ios/*.xcuserstate
+ios/**/xcuserdata/
+ios/**/*.xcuserstate
+*.xccheckout
+*.moved-aside
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+*.hmap
+*.ipa
+*.dSYM.zip
+*.dSYM
+timeline.xctimeline
+playground.xcworkspace
+
+# CocoaPods
+ios/Pods/
+ios/Podfile.lock
+
+# Swift Package Manager
+ios/.swiftpm/
+ios/Package.resolved
+.build/
+
+# fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots/**/*.png
+fastlane/test_output
+
+# Code Injection
+iOSInjectionProject/

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.
+
+    Ascently is a FOSS app meant to help climbers track their sessions, routes/problems, and overall progress.
+    Copyright (C) 2025 Atridad Lahiji
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    Ascently  Copyright (C) 2025  Atridad Lahiji
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

Makefile

@@ -0,0 +1,90 @@
+# Ascently Makefile
+
+.PHONY: help android-lint android-format android-build android-test \
+        ios-lint ios-format ios-build ios-test clean
+
+# Default target
+help:
+	@echo "Ascently Dev Commands"
+	@echo "=============================="
+	@echo ""
+	@echo "Android:"
+	@echo "  make android-lint: Run Detekt static analysis"
+	@echo "  make android-format: Check code formatting with Spotless"
+	@echo "  make android-format-fix: Auto-fix code formatting"
+	@echo "  make android-build: Build debug APK"
+	@echo "  make android-release: Build release APK"
+	@echo "  make android-test: Run unit tests"
+	@echo ""
+	@echo "iOS:"
+	@echo "  make ios-lint: Run SwiftLint"
+	@echo "  make ios-lint-fix: Run SwiftLint with auto-fix"
+	@echo "  make ios-format: Run SwiftFormat (dry-run)"
+	@echo "  make ios-format-fix: Run SwiftFormat with auto-fix"
+	@echo "  make ios-build: Build iOS app"
+	@echo ""
+	@echo "General:"
+	@echo "  make lint: Run linters for both platforms"
+	@echo "  make format: Check formatting for both platforms"
+	@echo "  make clean: Clean build artifacts"
+
+# Android commands
+android-lint:
+	cd android && ./gradlew detekt
+
+android-format:
+	cd android && ./gradlew spotlessCheck
+
+android-format-fix:
+	cd android && ./gradlew spotlessApply
+
+android-build:
+	cd android && ./gradlew assembleDebug
+
+android-release:
+	cd android && ./gradlew assembleRelease
+
+android-test:
+	cd android && ./gradlew test
+
+# iOS commands (requires SwiftLint and SwiftFormat!!!)
+ios-lint:
+	@if command -v swiftlint >/dev/null 2>&1; then \
+		cd ios && swiftlint; \
+	else \
+		echo "SwiftLint not installed. Install with: brew install swiftlint"; \
+	fi
+
+ios-lint-fix:
+	@if command -v swiftlint >/dev/null 2>&1; then \
+		cd ios && swiftlint --fix; \
+	else \
+		echo "SwiftLint not installed. Install with: brew install swiftlint"; \
+	fi
+
+ios-format:
+	@if command -v swiftformat >/dev/null 2>&1; then \
+		cd ios && swiftformat . --lint; \
+	else \
+		echo "SwiftFormat not installed. Install with: brew install swiftformat"; \
+	fi
+
+ios-format-fix:
+	@if command -v swiftformat >/dev/null 2>&1; then \
+		cd ios && swiftformat .; \
+	else \
+		echo "SwiftFormat not installed. Install with: brew install swiftformat"; \
+	fi
+
+ios-build:
+	cd ios && xcodebuild -project Ascently.xcodeproj -scheme Ascently -configuration Debug build
+
+# Combined commands
+lint: android-lint ios-lint
+
+format: android-format ios-format
+
+# Clean
+clean:
+	cd android && ./gradlew clean
+	rm -rf ios/build ios/DerivedData

README.md

@@ -1,5 +1,7 @@
 # Ascently
 
+<img src="https://git.atri.dad/atridad/Ascently/raw/branch/main/docs/src/assets/logo.png" alt="Ascently Logo" width="250" height="250">
+
 _Formerly OpenClimb_
 
 Ascently is an **offline-first FOSS** app designed to help climbers track their sessions, routes/problems, and overall progress. There is an optional self-hosted sync server and integrations with Apple Health and Health Connect. There are no analytics or tracking baked into any part of this project. I am committed to maintaining a transparent and open-source solution for climbers, ensuring that you have full control over your data and privacy.

android/.editorconfig

@@ -0,0 +1,31 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.{kt,kts}]
+indent_size = 4
+max_line_length = 220
+ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
+ktlint_standard_no-wildcard-imports = disabled
+ktlint_standard_package-name = disabled
+
+[*.{xml,gradle}]
+indent_size = 4
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.properties]
+indent_size = 2
+
+[*.toml]
+indent_size = 4
+
+[Makefile]
+indent_style = tab

android/README.md

@@ -3,7 +3,6 @@
 This is the native Android app for Ascently, built with Kotlin and Jetpack Compose.
 
 ## Project Structure
-
 This is a standard Android Gradle project. The main code lives in `app/src/main/java/com/atridad/ascently/`.
 
 -   `data/`: Handles all the app's data.

android/app/build.gradle.kts

@@ -6,6 +6,8 @@ plugins {
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.ksp)
+    alias(libs.plugins.detekt)
+    alias(libs.plugins.spotless)
 }
 
 android {
@@ -16,8 +18,8 @@ android {
         applicationId = "com.atridad.ascently"
         minSdk = 31
         targetSdk = 36
-        versionCode = 47
-        versionName = "2.3.1"
+        versionCode = 51
+        versionName = "2.5.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -26,8 +28,8 @@ android {
         release {
             isMinifyEnabled = true
             proguardFiles(
-                    getDefaultProguardFile("proguard-android-optimize.txt"),
-                    "proguard-rules.pro"
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro",
             )
         }
     }
@@ -83,7 +85,7 @@ dependencies {
     implementation(libs.coil.compose)
 
     // Health Connect
-    implementation("androidx.health.connect:connect-client:1.1.0-alpha07")
+    implementation(libs.health.connect)
 
     // Testing
     testImplementation(libs.junit)
@@ -99,6 +101,51 @@ dependencies {
     androidTestImplementation(libs.androidx.ui.test.junit4)
     debugImplementation(libs.androidx.ui.tooling)
     debugImplementation(libs.androidx.ui.test.manifest)
-    debugImplementation(libs.androidx.ui.tooling)
-    debugImplementation(libs.androidx.ui.test.manifest)
+}
+
+// Detekt configuration
+detekt {
+    config.setFrom(files("$rootDir/detekt.yml"))
+    buildUponDefaultConfig = true
+    allRules = false
+    parallel = true
+}
+
+// Spotless configuration for code formatting
+spotless {
+    kotlin {
+        target("**/*.kt")
+        targetExclude("**/build/**/*.kt")
+        ktlint("1.2.1")
+            .editorConfigOverride(
+                mapOf(
+                    "ktlint_standard_no-wildcard-imports" to "disabled",
+                    "ktlint_standard_package-name" to "disabled",
+                    "ktlint_standard_function-naming" to "disabled",
+                    "ktlint_standard_filename" to "disabled",
+                    "ktlint_standard_value-parameter-comment" to "disabled",
+                    "ktlint_standard_comment-wrapping" to "disabled",
+                    "ktlint_standard_multiline-expression-wrapping" to "disabled",
+                    "ktlint_standard_string-template-indent" to "disabled",
+                    "ktlint_standard_property-naming" to "disabled",
+                    "ktlint_standard_class-naming" to "disabled",
+                    "ktlint_standard_backing-property-naming" to "disabled",
+                    "ktlint_standard_function-signature" to "disabled",
+                    "ktlint_standard_parameter-list-wrapping" to "disabled",
+                    "ktlint_standard_max-line-length" to "disabled",
+                    "max_line_length" to "off",
+                ),
+            )
+    }
+    kotlinGradle {
+        target("**/*.kts")
+        targetExclude("**/build/**/*.kts")
+        ktlint("1.2.1")
+            .editorConfigOverride(
+                mapOf(
+                    "ktlint_standard_no-wildcard-imports" to "disabled",
+                    "max_line_length" to "off",
+                ),
+            )
+    }
 }

android/app/proguard-rules.pro

@@ -5,17 +5,61 @@
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
 
+# Preserve line number information for debugging stack traces
+-keepattributes SourceFile,LineNumberTable
+
+# Hide the original source file name
+-renamesourcefileattribute SourceFile
+
+# Keep generic signatures for Kotlin
+-keepattributes Signature
+
+# Keep annotations
+-keepattributes *Annotation*
+
+# Room Database
+-keep class * extends androidx.room.RoomDatabase
+-keep @androidx.room.Entity class *
+-keepclassmembers class * {
+    @androidx.room.* <fields>;
+    @androidx.room.* <methods>;
+}
+
+# Kotlinx Serialization
+-keepattributes *Annotation*, InnerClasses
+-dontnote kotlinx.serialization.AnnotationsKt
+
+-keepclassmembers class kotlinx.serialization.json.** {
+    *** Companion;
+}
+-keepclasseswithmembers class kotlinx.serialization.json.** {
+    kotlinx.serialization.KSerializer serializer(...);
+}
+
+-keep,includedescriptorclasses class com.atridad.ascently.**$$serializer { *; }
+-keepclassmembers class com.atridad.ascently.** {
+    *** Companion;
+}
+-keepclasseswithmembers class com.atridad.ascently.** {
+    kotlinx.serialization.KSerializer serializer(...);
+}
+
+# Keep data classes used for serialization
+-keep class com.atridad.ascently.data.model.** { *; }
+-keep class com.atridad.ascently.data.format.** { *; }
+
+# Coroutines
+-keepnames class kotlinx.coroutines.internal.MainDispatcherFactory {}
+-keepnames class kotlinx.coroutines.CoroutineExceptionHandler {}
+-keepclassmembers class kotlinx.coroutines.** {
+    volatile <fields>;
+}
+
+
+
 # If your project uses WebView with JS, uncomment the following
 # and specify the fully qualified class name to the JavaScript interface
 # class:
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#}

android/app/src/main/java/com/atridad/ascently/MainActivity.kt

@@ -37,9 +37,9 @@ class MainActivity : ComponentActivity() {
             AscentlyTheme {
                 Surface(modifier = Modifier.fillMaxSize()) {
                     AscentlyApp(
-                            shortcutAction = shortcutAction,
-                            lastUsedGymId = lastUsedGymId,
-                            onShortcutActionProcessed = { clearShortcutAction() }
+                        shortcutAction = shortcutAction,
+                        lastUsedGymId = lastUsedGymId,
+                        onShortcutActionProcessed = { clearShortcutAction() },
                     )
                 }
             }

android/app/src/main/java/com/atridad/ascently/data/database/Converters.kt

@@ -6,75 +6,74 @@ import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 
 class Converters {
-    
+
     @TypeConverter
     fun fromClimbTypeList(value: List<ClimbType>): String {
         return Json.encodeToString(value)
     }
-    
+
     @TypeConverter
     fun toClimbTypeList(value: String): List<ClimbType> {
         return Json.decodeFromString(value)
     }
-    
+
     @TypeConverter
     fun fromDifficultySystemList(value: List<DifficultySystem>): String {
         return Json.encodeToString(value)
     }
-    
+
     @TypeConverter
     fun toDifficultySystemList(value: String): List<DifficultySystem> {
         return Json.decodeFromString(value)
     }
-    
+
     @TypeConverter
     fun fromStringList(value: List<String>): String {
         return Json.encodeToString(value)
     }
-    
+
     @TypeConverter
     fun toStringList(value: String): List<String> {
         return Json.decodeFromString(value)
     }
-    
+
     @TypeConverter
     fun fromDifficultyGrade(value: DifficultyGrade): String {
         return Json.encodeToString(value)
     }
-    
+
     @TypeConverter
     fun toDifficultyGrade(value: String): DifficultyGrade {
         return Json.decodeFromString(value)
     }
-    
+
     @TypeConverter
     fun fromClimbType(value: ClimbType): String {
         return value.name
     }
-    
+
     @TypeConverter
     fun toClimbType(value: String): ClimbType {
         return ClimbType.valueOf(value)
     }
-    
+
     @TypeConverter
     fun fromAttemptResult(value: AttemptResult): String {
         return value.name
     }
-    
+
     @TypeConverter
     fun toAttemptResult(value: String): AttemptResult {
         return AttemptResult.valueOf(value)
     }
-    
+
     @TypeConverter
     fun fromSessionStatus(value: SessionStatus): String {
         return value.name
     }
-    
+
     @TypeConverter
     fun toSessionStatus(value: String): SessionStatus {
         return SessionStatus.valueOf(value)
     }
-
 }

android/app/src/main/java/com/atridad/ascently/data/database/OpenClimbDatabase.kt

@@ -11,9 +11,9 @@ import com.atridad.ascently.data.database.dao.*
 import com.atridad.ascently.data.model.*
 
 @Database(
-        entities = [Gym::class, Problem::class, ClimbSession::class, Attempt::class],
-        version = 6,
-        exportSchema = false
+    entities = [Gym::class, Problem::class, ClimbSession::class, Attempt::class],
+    version = 6,
+    exportSchema = false,
 )
 @TypeConverters(Converters::class)
 abstract class AscentlyDatabase : RoomDatabase() {
@@ -27,79 +27,79 @@ abstract class AscentlyDatabase : RoomDatabase() {
         @Volatile private var INSTANCE: AscentlyDatabase? = null
 
         val MIGRATION_4_5 =
-                object : Migration(4, 5) {
-                    override fun migrate(db: SupportSQLiteDatabase) {
-                        val cursor = db.query("PRAGMA table_info(climb_sessions)")
-                        val existingColumns = mutableSetOf<String>()
+            object : Migration(4, 5) {
+                override fun migrate(db: SupportSQLiteDatabase) {
+                    val cursor = db.query("PRAGMA table_info(climb_sessions)")
+                    val existingColumns = mutableSetOf<String>()
 
-                        while (cursor.moveToNext()) {
-                            val columnName = cursor.getString(cursor.getColumnIndexOrThrow("name"))
-                            existingColumns.add(columnName)
-                        }
-                        cursor.close()
-
-                        if (!existingColumns.contains("startTime")) {
-                            db.execSQL("ALTER TABLE climb_sessions ADD COLUMN startTime TEXT")
-                        }
-                        if (!existingColumns.contains("endTime")) {
-                            db.execSQL("ALTER TABLE climb_sessions ADD COLUMN endTime TEXT")
-                        }
-                        if (!existingColumns.contains("status")) {
-                            db.execSQL(
-                                    "ALTER TABLE climb_sessions ADD COLUMN status TEXT NOT NULL DEFAULT 'COMPLETED'"
-                            )
-                        }
+                    while (cursor.moveToNext()) {
+                        val columnName = cursor.getString(cursor.getColumnIndexOrThrow("name"))
+                        existingColumns.add(columnName)
+                    }
+                    cursor.close()
 
+                    if (!existingColumns.contains("startTime")) {
+                        db.execSQL("ALTER TABLE climb_sessions ADD COLUMN startTime TEXT")
+                    }
+                    if (!existingColumns.contains("endTime")) {
+                        db.execSQL("ALTER TABLE climb_sessions ADD COLUMN endTime TEXT")
+                    }
+                    if (!existingColumns.contains("status")) {
                         db.execSQL(
-                                "UPDATE climb_sessions SET startTime = createdAt WHERE startTime IS NULL"
-                        )
-                        db.execSQL(
-                                "UPDATE climb_sessions SET status = 'COMPLETED' WHERE status IS NULL OR status = ''"
+                            "ALTER TABLE climb_sessions ADD COLUMN status TEXT NOT NULL DEFAULT 'COMPLETED'",
                         )
                     }
+
+                    db.execSQL(
+                        "UPDATE climb_sessions SET startTime = createdAt WHERE startTime IS NULL",
+                    )
+                    db.execSQL(
+                        "UPDATE climb_sessions SET status = 'COMPLETED' WHERE status IS NULL OR status = ''",
+                    )
                 }
+            }
 
         val MIGRATION_5_6 =
-                object : Migration(5, 6) {
-                    override fun migrate(db: SupportSQLiteDatabase) {
-                        // Add updatedAt column to attempts table
-                        val cursor = db.query("PRAGMA table_info(attempts)")
-                        val existingColumns = mutableSetOf<String>()
+            object : Migration(5, 6) {
+                override fun migrate(db: SupportSQLiteDatabase) {
+                    // Add updatedAt column to attempts table
+                    val cursor = db.query("PRAGMA table_info(attempts)")
+                    val existingColumns = mutableSetOf<String>()
 
-                        while (cursor.moveToNext()) {
-                            val columnName = cursor.getString(cursor.getColumnIndexOrThrow("name"))
-                            existingColumns.add(columnName)
-                        }
-                        cursor.close()
+                    while (cursor.moveToNext()) {
+                        val columnName = cursor.getString(cursor.getColumnIndexOrThrow("name"))
+                        existingColumns.add(columnName)
+                    }
+                    cursor.close()
 
-                        if (!existingColumns.contains("updatedAt")) {
-                            db.execSQL(
-                                    "ALTER TABLE attempts ADD COLUMN updatedAt TEXT NOT NULL DEFAULT ''"
-                            )
-                            // Set updatedAt to createdAt for existing records
-                            db.execSQL(
-                                    "UPDATE attempts SET updatedAt = createdAt WHERE updatedAt = ''"
-                            )
-                        }
+                    if (!existingColumns.contains("updatedAt")) {
+                        db.execSQL(
+                            "ALTER TABLE attempts ADD COLUMN updatedAt TEXT NOT NULL DEFAULT ''",
+                        )
+                        // Set updatedAt to createdAt for existing records
+                        db.execSQL(
+                            "UPDATE attempts SET updatedAt = createdAt WHERE updatedAt = ''",
+                        )
                     }
                 }
+            }
 
         fun getDatabase(context: Context): AscentlyDatabase {
             return INSTANCE
-                    ?: synchronized(this) {
-                        val instance =
-                            Room.databaseBuilder(
-                                context.applicationContext,
-                                AscentlyDatabase::class.java,
-                                "ascently_database"
-                            )
-                                .addMigrations(MIGRATION_4_5, MIGRATION_5_6)
-                                .enableMultiInstanceInvalidation()
-                                .fallbackToDestructiveMigration(false)
-                                        .build()
-                        INSTANCE = instance
-                        instance
-                    }
+                ?: synchronized(this) {
+                    val instance =
+                        Room.databaseBuilder(
+                            context.applicationContext,
+                            AscentlyDatabase::class.java,
+                            "ascently_database",
+                        )
+                            .addMigrations(MIGRATION_4_5, MIGRATION_5_6)
+                            .enableMultiInstanceInvalidation()
+                            .fallbackToDestructiveMigration(false)
+                            .build()
+                    INSTANCE = instance
+                    instance
+                }
         }
     }
 }

android/app/src/main/java/com/atridad/ascently/data/database/dao/AttemptDao.kt

@@ -7,70 +7,70 @@ import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface AttemptDao {
-    
+
     @Query("SELECT * FROM attempts ORDER BY timestamp DESC")
     fun getAllAttempts(): Flow<List<Attempt>>
-    
+
     @Query("SELECT * FROM attempts WHERE id = :id")
     suspend fun getAttemptById(id: String): Attempt?
-    
+
     @Query("SELECT * FROM attempts WHERE sessionId = :sessionId ORDER BY timestamp ASC")
     fun getAttemptsBySession(sessionId: String): Flow<List<Attempt>>
-    
+
     @Query("SELECT * FROM attempts WHERE problemId = :problemId ORDER BY timestamp DESC")
     fun getAttemptsByProblem(problemId: String): Flow<List<Attempt>>
-    
+
     @Query("SELECT * FROM attempts WHERE sessionId = :sessionId AND problemId = :problemId ORDER BY timestamp ASC")
     fun getAttemptsBySessionAndProblem(sessionId: String, problemId: String): Flow<List<Attempt>>
-    
+
     @Query("SELECT * FROM attempts WHERE result = :result ORDER BY timestamp DESC")
     fun getAttemptsByResult(result: AttemptResult): Flow<List<Attempt>>
-    
+
     @Query("SELECT * FROM attempts WHERE timestamp BETWEEN :startDate AND :endDate ORDER BY timestamp DESC")
     fun getAttemptsInDateRange(startDate: String, endDate: String): Flow<List<Attempt>>
-    
+
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertAttempt(attempt: Attempt)
-    
+
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertAttempts(attempts: List<Attempt>)
-    
+
     @Update
     suspend fun updateAttempt(attempt: Attempt)
-    
+
     @Delete
     suspend fun deleteAttempt(attempt: Attempt)
-    
+
     @Query("DELETE FROM attempts WHERE id = :id")
     suspend fun deleteAttemptById(id: String)
-    
+
     @Query("DELETE FROM attempts WHERE sessionId = :sessionId")
     suspend fun deleteAttemptsBySession(sessionId: String)
-    
+
     @Query("DELETE FROM attempts WHERE problemId = :problemId")
     suspend fun deleteAttemptsByProblem(problemId: String)
-    
+
     @Query("SELECT COUNT(*) FROM attempts")
     suspend fun getAttemptsCount(): Int
-    
+
     @Query("DELETE FROM attempts")
     suspend fun deleteAllAttempts()
-    
+
     @Query("SELECT COUNT(*) FROM attempts WHERE sessionId = :sessionId")
     suspend fun getAttemptsCountBySession(sessionId: String): Int
-    
+
     @Query("SELECT COUNT(*) FROM attempts WHERE problemId = :problemId")
     suspend fun getAttemptsCountByProblem(problemId: String): Int
-    
+
     @Query("SELECT COUNT(*) FROM attempts WHERE result = :result")
     suspend fun getAttemptsCountByResult(result: AttemptResult): Int
-    
+
     @Query("SELECT COUNT(*) FROM attempts WHERE problemId = :problemId AND result IN ('SUCCESS', 'FLASH', 'REDPOINT', 'ONSIGHT')")
     suspend fun getSuccessfulAttemptsCountByProblem(problemId: String): Int
-    
+
     @Query("SELECT * FROM attempts WHERE problemId = :problemId AND result IN ('SUCCESS', 'FLASH', 'REDPOINT', 'ONSIGHT') ORDER BY timestamp ASC LIMIT 1")
     suspend fun getFirstSuccessfulAttempt(problemId: String): Attempt?
-    
+
     @Query("SELECT * FROM attempts WHERE problemId = :problemId ORDER BY timestamp DESC LIMIT 1")
     suspend fun getLatestAttemptForProblem(problemId: String): Attempt?
 }

android/app/src/main/java/com/atridad/ascently/data/database/dao/ClimbSessionDao.kt

@@ -7,61 +7,61 @@ import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface ClimbSessionDao {
-    
+
     @Query("SELECT * FROM climb_sessions ORDER BY date DESC")
     fun getAllSessions(): Flow<List<ClimbSession>>
-    
+
     @Query("SELECT * FROM climb_sessions WHERE id = :id")
     suspend fun getSessionById(id: String): ClimbSession?
-    
+
     @Query("SELECT * FROM climb_sessions WHERE gymId = :gymId ORDER BY date DESC")
     fun getSessionsByGym(gymId: String): Flow<List<ClimbSession>>
-    
+
     @Query("SELECT * FROM climb_sessions WHERE date = :date ORDER BY createdAt DESC")
     fun getSessionsByDate(date: String): Flow<List<ClimbSession>>
-    
+
     @Query("SELECT * FROM climb_sessions WHERE date BETWEEN :startDate AND :endDate ORDER BY date DESC")
     fun getSessionsInDateRange(startDate: String, endDate: String): Flow<List<ClimbSession>>
-    
+
     @Query("SELECT * FROM climb_sessions ORDER BY date DESC LIMIT :limit")
     fun getRecentSessions(limit: Int = 10): Flow<List<ClimbSession>>
-    
+
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertSession(session: ClimbSession)
-    
+
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertSessions(sessions: List<ClimbSession>)
-    
+
     @Update
     suspend fun updateSession(session: ClimbSession)
-    
+
     @Delete
     suspend fun deleteSession(session: ClimbSession)
-    
+
     @Query("DELETE FROM climb_sessions WHERE id = :id")
     suspend fun deleteSessionById(id: String)
-    
+
     @Query("SELECT COUNT(*) FROM climb_sessions")
     suspend fun getSessionsCount(): Int
-    
+
     @Query("SELECT COUNT(*) FROM climb_sessions WHERE gymId = :gymId")
     suspend fun getSessionsCountByGym(gymId: String): Int
-    
+
     @Query("SELECT COUNT(*) FROM climb_sessions WHERE date BETWEEN :startDate AND :endDate")
     suspend fun getSessionsCountInDateRange(startDate: String, endDate: String): Int
-    
+
     @Query("SELECT DISTINCT date FROM climb_sessions ORDER BY date DESC")
     suspend fun getUniqueDates(): List<String>
-    
+
     @Query("SELECT * FROM climb_sessions WHERE status = :status ORDER BY date DESC")
     fun getSessionsByStatus(status: SessionStatus): Flow<List<ClimbSession>>
-    
+
     @Query("SELECT * FROM climb_sessions WHERE status = 'ACTIVE' ORDER BY date DESC LIMIT 1")
     suspend fun getActiveSession(): ClimbSession?
-    
+
     @Query("DELETE FROM climb_sessions")
     suspend fun deleteAllSessions()
-    
+
     @Query("SELECT * FROM climb_sessions WHERE status = 'ACTIVE' ORDER BY date DESC LIMIT 1")
     fun getActiveSessionFlow(): Flow<ClimbSession?>
 }

android/app/src/main/java/com/atridad/ascently/data/database/dao/GymDao.kt

@@ -7,37 +7,37 @@ import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface GymDao {
-    
+
     @Query("SELECT * FROM gyms ORDER BY name ASC")
     fun getAllGyms(): Flow<List<Gym>>
-    
+
     @Query("SELECT * FROM gyms WHERE id = :id")
     suspend fun getGymById(id: String): Gym?
-    
+
     @Query("SELECT * FROM gyms WHERE :climbType IN (supportedClimbTypes)")
     fun getGymsByClimbType(climbType: ClimbType): Flow<List<Gym>>
-    
+
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertGym(gym: Gym)
-    
+
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertGyms(gyms: List<Gym>)
-    
+
     @Update
     suspend fun updateGym(gym: Gym)
-    
+
     @Delete
     suspend fun deleteGym(gym: Gym)
-    
+
     @Query("DELETE FROM gyms WHERE id = :id")
     suspend fun deleteGymById(id: String)
-    
+
     @Query("SELECT COUNT(*) FROM gyms")
     suspend fun getGymsCount(): Int
-    
+
     @Query("SELECT * FROM gyms WHERE name LIKE '%' || :searchQuery || '%' OR location LIKE '%' || :searchQuery || '%'")
     fun searchGyms(searchQuery: String): Flow<List<Gym>>
-    
+
     @Query("DELETE FROM gyms")
     suspend fun deleteAllGyms()
 }

android/app/src/main/java/com/atridad/ascently/data/database/dao/ProblemDao.kt

@@ -11,7 +11,8 @@ interface ProblemDao {
     @Query("SELECT * FROM problems ORDER BY updatedAt DESC")
     fun getAllProblems(): Flow<List<Problem>>
 
-    @Query("SELECT * FROM problems WHERE id = :id") suspend fun getProblemById(id: String): Problem?
+    @Query("SELECT * FROM problems WHERE id = :id")
+    suspend fun getProblemById(id: String): Problem?
 
     @Query("SELECT * FROM problems WHERE gymId = :gymId ORDER BY updatedAt DESC")
     fun getProblemsByGym(gymId: String): Flow<List<Problem>>
@@ -20,7 +21,7 @@ interface ProblemDao {
     fun getProblemsByClimbType(climbType: ClimbType): Flow<List<Problem>>
 
     @Query(
-            "SELECT * FROM problems WHERE gymId = :gymId AND climbType = :climbType ORDER BY updatedAt DESC"
+        "SELECT * FROM problems WHERE gymId = :gymId AND climbType = :climbType ORDER BY updatedAt DESC",
     )
     fun getProblemsByGymAndType(gymId: String, climbType: ClimbType): Flow<List<Problem>>
 
@@ -30,7 +31,8 @@ interface ProblemDao {
     @Query("SELECT * FROM problems WHERE gymId = :gymId AND isActive = 1 ORDER BY updatedAt DESC")
     fun getActiveProblemsByGym(gymId: String): Flow<List<Problem>>
 
-    @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun insertProblem(problem: Problem)
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertProblem(problem: Problem)
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertProblems(problems: List<Problem>)
@@ -39,7 +41,8 @@ interface ProblemDao {
 
     @Delete suspend fun deleteProblem(problem: Problem)
 
-    @Query("DELETE FROM problems WHERE id = :id") suspend fun deleteProblemById(id: String)
+    @Query("DELETE FROM problems WHERE id = :id")
+    suspend fun deleteProblemById(id: String)
 
     @Query("SELECT COUNT(*) FROM problems WHERE gymId = :gymId")
     suspend fun getProblemsCountByGym(gymId: String): Int
@@ -48,17 +51,19 @@ interface ProblemDao {
     suspend fun getActiveProblemsCount(): Int
 
     @Query(
-            """
+        """
         SELECT * FROM problems
         WHERE (name LIKE '%' || :searchQuery || '%'
         OR description LIKE '%' || :searchQuery || '%'
         OR location LIKE '%' || :searchQuery || '%')
         ORDER BY updatedAt DESC
-    """
+    """,
     )
     fun searchProblems(searchQuery: String): Flow<List<Problem>>
 
-    @Query("SELECT COUNT(*) FROM problems") suspend fun getProblemsCount(): Int
+    @Query("SELECT COUNT(*) FROM problems")
+    suspend fun getProblemsCount(): Int
 
-    @Query("DELETE FROM problems") suspend fun deleteAllProblems()
+    @Query("DELETE FROM problems")
+    suspend fun deleteAllProblems()
 }

android/app/src/main/java/com/atridad/ascently/data/format/BackupFormat.kt

@@ -6,64 +6,80 @@ import kotlinx.serialization.Serializable
 // Root structure for Ascently backup data
 @Serializable
 data class ClimbDataBackup(
-        val exportedAt: String,
-        val version: String = "2.0",
-        val formatVersion: String = "2.0",
-        val gyms: List<BackupGym>,
-        val problems: List<BackupProblem>,
-        val sessions: List<BackupClimbSession>,
-        val attempts: List<BackupAttempt>,
-        val deletedItems: List<DeletedItem> = emptyList()
+    val exportedAt: String,
+    val version: String = "2.0",
+    val formatVersion: String = "2.0",
+    val gyms: List<BackupGym>,
+    val problems: List<BackupProblem>,
+    val sessions: List<BackupClimbSession>,
+    val attempts: List<BackupAttempt>,
 )
 
 @Serializable
 data class DeletedItem(
-        val id: String,
-        val type: String, // "gym", "problem", "session", "attempt"
-        val deletedAt: String
+    val id: String,
+    val type: String, // "gym", "problem", "session", "attempt"
+    val deletedAt: String,
 )
 
 // Platform-neutral gym representation for backup/restore
 @Serializable
 data class BackupGym(
-        val id: String,
-        val name: String,
-        val location: String? = null,
-        val supportedClimbTypes: List<ClimbType>,
-        val difficultySystems: List<DifficultySystem>,
-        @kotlinx.serialization.SerialName("customDifficultyGrades")
-        val customDifficultyGrades: List<String>? = null,
-        val notes: String? = null,
-        val createdAt: String,
-        val updatedAt: String
+    val id: String,
+    val name: String,
+    val location: String? = null,
+    val supportedClimbTypes: List<ClimbType>,
+    val difficultySystems: List<DifficultySystem>,
+    @kotlinx.serialization.SerialName("customDifficultyGrades")
+    val customDifficultyGrades: List<String>? = null,
+    val notes: String? = null,
+    val isDeleted: Boolean = false,
+    val createdAt: String,
+    val updatedAt: String,
 ) {
     companion object {
         fun fromGym(gym: Gym): BackupGym {
             return BackupGym(
-                    id = gym.id,
-                    name = gym.name,
-                    location = gym.location,
-                    supportedClimbTypes = gym.supportedClimbTypes,
-                    difficultySystems = gym.difficultySystems,
-                    customDifficultyGrades = gym.customDifficultyGrades.ifEmpty { null },
-                    notes = gym.notes,
-                    createdAt = gym.createdAt,
-                    updatedAt = gym.updatedAt
+                id = gym.id,
+                name = gym.name,
+                location = gym.location,
+                supportedClimbTypes = gym.supportedClimbTypes,
+                difficultySystems = gym.difficultySystems,
+                customDifficultyGrades = gym.customDifficultyGrades.ifEmpty { null },
+                notes = gym.notes,
+                isDeleted = false,
+                createdAt = gym.createdAt,
+                updatedAt = gym.updatedAt,
+            )
+        }
+
+        fun createTombstone(id: String, deletedAt: String): BackupGym {
+            return BackupGym(
+                id = id,
+                name = "DELETED",
+                location = null,
+                supportedClimbTypes = emptyList(),
+                difficultySystems = emptyList(),
+                customDifficultyGrades = null,
+                notes = null,
+                isDeleted = true,
+                createdAt = deletedAt,
+                updatedAt = deletedAt,
             )
         }
     }
 
     fun toGym(): Gym {
         return Gym(
-                id = id,
-                name = name,
-                location = location,
-                supportedClimbTypes = supportedClimbTypes,
-                difficultySystems = difficultySystems,
-                customDifficultyGrades = customDifficultyGrades ?: emptyList(),
-                notes = notes,
-                createdAt = createdAt,
-                updatedAt = updatedAt
+            id = id,
+            name = name,
+            location = location,
+            supportedClimbTypes = supportedClimbTypes,
+            difficultySystems = difficultySystems,
+            customDifficultyGrades = customDifficultyGrades ?: emptyList(),
+            notes = notes,
+            createdAt = createdAt,
+            updatedAt = updatedAt,
         )
     }
 }
@@ -71,60 +87,85 @@ data class BackupGym(
 // Platform-neutral problem representation for backup/restore
 @Serializable
 data class BackupProblem(
-        val id: String,
-        val gymId: String,
-        val name: String? = null,
-        val description: String? = null,
-        val climbType: ClimbType,
-        val difficulty: DifficultyGrade,
-        val tags: List<String>? = null,
-        val location: String? = null,
-        val imagePaths: List<String>? = null,
-        val isActive: Boolean = true,
-        val dateSet: String? = null,
-        val notes: String? = null,
-        val createdAt: String,
-        val updatedAt: String
+    val id: String,
+    val gymId: String,
+    val name: String? = null,
+    val description: String? = null,
+    val climbType: ClimbType,
+    val difficulty: DifficultyGrade,
+    val tags: List<String>? = null,
+    val location: String? = null,
+    val imagePaths: List<String>? = null,
+    val isActive: Boolean = true,
+    val dateSet: String? = null,
+    val notes: String? = null,
+    val isDeleted: Boolean = false,
+    val createdAt: String,
+    val updatedAt: String,
 ) {
     companion object {
         fun fromProblem(problem: Problem): BackupProblem {
             return BackupProblem(
-                    id = problem.id,
-                    gymId = problem.gymId,
-                    name = problem.name,
-                    description = problem.description,
-                    climbType = problem.climbType,
-                    difficulty = problem.difficulty,
-                    tags = problem.tags,
-                    location = problem.location,
-                    imagePaths =
-                            if (problem.imagePaths.isEmpty()) null
-                            else problem.imagePaths.map { path -> path.substringAfterLast('/') },
-                    isActive = problem.isActive,
-                    dateSet = problem.dateSet,
-                    notes = problem.notes,
-                    createdAt = problem.createdAt,
-                    updatedAt = problem.updatedAt
+                id = problem.id,
+                gymId = problem.gymId,
+                name = problem.name,
+                description = problem.description,
+                climbType = problem.climbType,
+                difficulty = problem.difficulty,
+                tags = problem.tags,
+                location = problem.location,
+                imagePaths =
+                if (problem.imagePaths.isEmpty()) {
+                    null
+                } else {
+                    problem.imagePaths.map { path -> path.substringAfterLast('/') }
+                },
+                isActive = problem.isActive,
+                dateSet = problem.dateSet,
+                notes = problem.notes,
+                isDeleted = false,
+                createdAt = problem.createdAt,
+                updatedAt = problem.updatedAt,
+            )
+        }
+
+        fun createTombstone(id: String, deletedAt: String): BackupProblem {
+            return BackupProblem(
+                id = id,
+                gymId = "00000000-0000-0000-0000-000000000000",
+                name = "DELETED",
+                description = null,
+                climbType = ClimbType.values().first(),
+                difficulty = DifficultyGrade(DifficultySystem.values().first(), "0"),
+                tags = null,
+                location = null,
+                imagePaths = null,
+                isActive = false,
+                dateSet = null,
+                notes = null,
+                isDeleted = true,
+                createdAt = deletedAt,
+                updatedAt = deletedAt,
             )
         }
     }
 
     fun toProblem(): Problem {
         return Problem(
-                id = id,
-                gymId = gymId,
-                name = name,
-                description = description,
-                climbType = climbType,
-                difficulty = difficulty,
-                tags = tags ?: emptyList(),
-                location = location,
-                imagePaths = imagePaths ?: emptyList(),
-                isActive = isActive,
-                dateSet = dateSet,
-                notes = notes,
-                createdAt = createdAt,
-                updatedAt = updatedAt
+            id = id,
+            gymId = gymId,
+            name = name,
+            description = description,
+            climbType = climbType,
+            difficulty = difficulty,
+            tags = tags ?: emptyList(),
+            location = location,
+            imagePaths = imagePaths ?: emptyList(),
+            isActive = isActive,
+            dateSet = dateSet,
+            notes = notes,
+            createdAt = createdAt,
+            updatedAt = updatedAt,
         )
     }
 
@@ -136,46 +177,64 @@ data class BackupProblem(
 // Platform-neutral climb session representation for backup/restore
 @Serializable
 data class BackupClimbSession(
-        val id: String,
-        val gymId: String,
-        val date: String,
-        val startTime: String? = null,
-        val endTime: String? = null,
-        val duration: Long? = null,
-        val status: SessionStatus,
-        val notes: String? = null,
-        val createdAt: String,
-        val updatedAt: String
+    val id: String,
+    val gymId: String,
+    val date: String,
+    val startTime: String? = null,
+    val endTime: String? = null,
+    val duration: Long? = null,
+    val status: SessionStatus,
+    val notes: String? = null,
+    val isDeleted: Boolean = false,
+    val createdAt: String,
+    val updatedAt: String,
 ) {
     companion object {
         fun fromClimbSession(session: ClimbSession): BackupClimbSession {
             return BackupClimbSession(
-                    id = session.id,
-                    gymId = session.gymId,
-                    date = session.date,
-                    startTime = session.startTime,
-                    endTime = session.endTime,
-                    duration = session.duration,
-                    status = session.status,
-                    notes = session.notes,
-                    createdAt = session.createdAt,
-                    updatedAt = session.updatedAt
+                id = session.id,
+                gymId = session.gymId,
+                date = session.date,
+                startTime = session.startTime,
+                endTime = session.endTime,
+                duration = session.duration,
+                status = session.status,
+                notes = session.notes,
+                isDeleted = false,
+                createdAt = session.createdAt,
+                updatedAt = session.updatedAt,
+            )
+        }
+
+        fun createTombstone(id: String, deletedAt: String): BackupClimbSession {
+            return BackupClimbSession(
+                id = id,
+                gymId = "00000000-0000-0000-0000-000000000000",
+                date = deletedAt,
+                startTime = null,
+                endTime = null,
+                duration = null,
+                status = SessionStatus.values().first(),
+                notes = null,
+                isDeleted = true,
+                createdAt = deletedAt,
+                updatedAt = deletedAt,
             )
         }
     }
 
     fun toClimbSession(): ClimbSession {
         return ClimbSession(
-                id = id,
-                gymId = gymId,
-                date = date,
-                startTime = startTime,
-                endTime = endTime,
-                duration = duration,
-                status = status,
-                notes = notes,
-                createdAt = createdAt,
-                updatedAt = updatedAt
+            id = id,
+            gymId = gymId,
+            date = date,
+            startTime = startTime,
+            endTime = endTime,
+            duration = duration,
+            status = status,
+            notes = notes,
+            createdAt = createdAt,
+            updatedAt = updatedAt,
         )
     }
 }
@@ -183,49 +242,68 @@ data class BackupClimbSession(
 // Platform-neutral attempt representation for backup/restore
 @Serializable
 data class BackupAttempt(
-        val id: String,
-        val sessionId: String,
-        val problemId: String,
-        val result: AttemptResult,
-        val highestHold: String? = null,
-        val notes: String? = null,
-        val duration: Long? = null,
-        val restTime: Long? = null,
-        val timestamp: String,
-        val createdAt: String,
-        val updatedAt: String? = null
+    val id: String,
+    val sessionId: String,
+    val problemId: String,
+    val result: AttemptResult,
+    val highestHold: String? = null,
+    val notes: String? = null,
+    val duration: Long? = null,
+    val restTime: Long? = null,
+    val timestamp: String,
+    val isDeleted: Boolean = false,
+    val createdAt: String,
+    val updatedAt: String? = null,
 ) {
     companion object {
         fun fromAttempt(attempt: Attempt): BackupAttempt {
             return BackupAttempt(
-                    id = attempt.id,
-                    sessionId = attempt.sessionId,
-                    problemId = attempt.problemId,
-                    result = attempt.result,
-                    highestHold = attempt.highestHold,
-                    notes = attempt.notes,
-                    duration = attempt.duration,
-                    restTime = attempt.restTime,
-                    timestamp = attempt.timestamp,
-                    createdAt = attempt.createdAt,
-                    updatedAt = attempt.updatedAt
+                id = attempt.id,
+                sessionId = attempt.sessionId,
+                problemId = attempt.problemId,
+                result = attempt.result,
+                highestHold = attempt.highestHold,
+                notes = attempt.notes,
+                duration = attempt.duration,
+                restTime = attempt.restTime,
+                timestamp = attempt.timestamp,
+                isDeleted = false,
+                createdAt = attempt.createdAt,
+                updatedAt = attempt.updatedAt,
+            )
+        }
+
+        fun createTombstone(id: String, deletedAt: String): BackupAttempt {
+            return BackupAttempt(
+                id = id,
+                sessionId = "00000000-0000-0000-0000-000000000000",
+                problemId = "00000000-0000-0000-0000-000000000000",
+                result = AttemptResult.values().first(),
+                highestHold = null,
+                notes = null,
+                duration = null,
+                restTime = null,
+                timestamp = deletedAt,
+                isDeleted = true,
+                createdAt = deletedAt,
+                updatedAt = deletedAt,
             )
         }
     }
 
     fun toAttempt(): Attempt {
         return Attempt(
-                id = id,
-                sessionId = sessionId,
-                problemId = problemId,
-                result = result,
-                highestHold = highestHold,
-                notes = notes,
-                duration = duration,
-                restTime = restTime,
-                timestamp = timestamp,
-                createdAt = createdAt,
-                updatedAt = updatedAt ?: createdAt
+            id = id,
+            sessionId = sessionId,
+            problemId = problemId,
+            result = result,
+            highestHold = highestHold,
+            notes = notes,
+            duration = duration,
+            restTime = restTime,
+            timestamp = timestamp,
+            createdAt = createdAt,
+            updatedAt = updatedAt ?: createdAt,
         )
     }
 }

android/app/src/main/java/com/atridad/ascently/data/health/HealthConnectStub.kt

@@ -3,7 +3,6 @@ package com.atridad.ascently.data.health
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.SharedPreferences
-import com.atridad.ascently.utils.AppLogger
 import androidx.activity.result.contract.ActivityResultContract
 import androidx.health.connect.client.HealthConnectClient
 import androidx.health.connect.client.PermissionController
@@ -11,17 +10,20 @@ import androidx.health.connect.client.permission.HealthPermission
 import androidx.health.connect.client.records.ExerciseSessionRecord
 import androidx.health.connect.client.records.HeartRateRecord
 import androidx.health.connect.client.records.TotalCaloriesBurnedRecord
+
 import androidx.health.connect.client.units.Energy
 import com.atridad.ascently.data.model.ClimbSession
 import com.atridad.ascently.data.model.SessionStatus
+import com.atridad.ascently.utils.AppLogger
 import com.atridad.ascently.utils.DateFormatUtils
-import java.time.Duration
-import java.time.Instant
-import java.time.ZoneOffset
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.flow
+import java.time.Duration
+import java.time.Instant
+import java.time.ZoneOffset
+import androidx.core.content.edit
 
 /**
  * Health Connect manager for Ascently that syncs climbing sessions to Samsung Health, Google Fit,
@@ -52,7 +54,7 @@ class HealthConnectManager(private val context: Context) {
                 HealthPermission.getReadPermission(HeartRateRecord::class),
                 HealthPermission.getWritePermission(HeartRateRecord::class),
                 HealthPermission.getReadPermission(TotalCaloriesBurnedRecord::class),
-                HealthPermission.getWritePermission(TotalCaloriesBurnedRecord::class)
+                HealthPermission.getWritePermission(TotalCaloriesBurnedRecord::class),
             )
     }
 
@@ -127,8 +129,9 @@ class HealthConnectManager(private val context: Context) {
 
     suspend fun isReady(): Boolean {
         return try {
-            if (!_isEnabled.value || !_isCompatible.value || healthConnectClient == null)
+            if (!_isEnabled.value || !_isCompatible.value || healthConnectClient == null) {
                 return false
+            }
 
             val isAvailable =
                 HealthConnectClient.getSdkStatus(context) == HealthConnectClient.SDK_AVAILABLE
@@ -157,18 +160,18 @@ class HealthConnectManager(private val context: Context) {
     suspend fun syncCompletedSession(
         session: ClimbSession,
         gymName: String,
-        attemptCount: Int = 0
+        attemptCount: Int = 0,
     ): Result<Unit> {
         return try {
             if (!isReady() || !_autoSync.value) {
                 return Result.failure(
-                    IllegalStateException("Health Connect not ready or auto-sync disabled")
+                    IllegalStateException("Health Connect not ready or auto-sync disabled"),
                 )
             }
 
             if (session.status != SessionStatus.COMPLETED) {
                 return Result.failure(
-                    IllegalArgumentException("Only completed sessions can be synced")
+                    IllegalArgumentException("Only completed sessions can be synced"),
                 )
             }
 
@@ -177,7 +180,7 @@ class HealthConnectManager(private val context: Context) {
 
             if (startTime == null || endTime == null) {
                 return Result.failure(
-                    IllegalArgumentException("Session must have valid start and end times")
+                    IllegalArgumentException("Session must have valid start and end times"),
                 )
             }
 
@@ -190,12 +193,13 @@ class HealthConnectManager(private val context: Context) {
                     ExerciseSessionRecord(
                         startTime = startTime,
                         startZoneOffset =
-                            ZoneOffset.systemDefault().rules.getOffset(startTime),
+                        ZoneOffset.systemDefault().rules.getOffset(startTime),
                         endTime = endTime,
                         endZoneOffset = ZoneOffset.systemDefault().rules.getOffset(endTime),
                         exerciseType =
-                            ExerciseSessionRecord.EXERCISE_TYPE_STRENGTH_TRAINING,
-                        title = "Rock Climbing at $gymName"
+                        ExerciseSessionRecord.EXERCISE_TYPE_STRENGTH_TRAINING,
+                        title = "Rock Climbing at $gymName",
+                        metadata = androidx.health.connect.client.records.metadata.Metadata.manualEntry(),
                     )
                 records.add(exerciseSession)
             } catch (e: Exception) {
@@ -211,11 +215,12 @@ class HealthConnectManager(private val context: Context) {
                         TotalCaloriesBurnedRecord(
                             startTime = startTime,
                             startZoneOffset =
-                                ZoneOffset.systemDefault().rules.getOffset(startTime),
+                            ZoneOffset.systemDefault().rules.getOffset(startTime),
                             endTime = endTime,
                             endZoneOffset =
-                                ZoneOffset.systemDefault().rules.getOffset(endTime),
-                            energy = Energy.calories(estimatedCalories)
+                            ZoneOffset.systemDefault().rules.getOffset(endTime),
+                            energy = Energy.calories(estimatedCalories),
+                            metadata = androidx.health.connect.client.records.metadata.Metadata.manualEntry(),
                         )
                     records.add(caloriesRecord)
                 }
@@ -238,9 +243,9 @@ class HealthConnectManager(private val context: Context) {
                 }
 
                 preferences
-                    .edit()
-                    .putString("last_sync_success", DateFormatUtils.nowISO8601())
-                    .apply()
+                    .edit {
+                        putString("last_sync_success", DateFormatUtils.nowISO8601())
+                    }
             } else {
                 val reason =
                     when {
@@ -262,7 +267,7 @@ class HealthConnectManager(private val context: Context) {
     suspend fun autoSyncCompletedSession(
         session: ClimbSession,
         gymName: String,
-        attemptCount: Int = 0
+        attemptCount: Int = 0,
     ): Result<Unit> {
         return if (_autoSync.value && isReady() && session.status == SessionStatus.COMPLETED) {
             AppLogger.d(TAG) { "Auto-syncing completed session '${session.id}' to Health Connect..." }
@@ -295,7 +300,7 @@ class HealthConnectManager(private val context: Context) {
     private fun createHeartRateRecord(
         startTime: Instant,
         endTime: Instant,
-        attemptCount: Int
+        attemptCount: Int,
     ): HeartRateRecord? {
         return try {
             val samples = mutableListOf<HeartRateRecord.Sample>()
@@ -324,7 +329,8 @@ class HealthConnectManager(private val context: Context) {
                 startZoneOffset = ZoneOffset.systemDefault().rules.getOffset(startTime),
                 endTime = endTime,
                 endZoneOffset = ZoneOffset.systemDefault().rules.getOffset(endTime),
-                samples = samples
+                samples = samples,
+                metadata = androidx.health.connect.client.records.metadata.Metadata.manualEntry(),
             )
         } catch (e: Exception) {
             AppLogger.e(TAG, e) { "Error creating heart rate record" }

android/app/src/main/java/com/atridad/ascently/data/model/Attempt.kt

@@ -1,5 +1,6 @@
 package com.atridad.ascently.data.model
 
+import androidx.compose.runtime.Immutable
 import androidx.room.Entity
 import androidx.room.ForeignKey
 import androidx.room.Index
@@ -12,65 +13,67 @@ enum class AttemptResult {
     SUCCESS,
     FALL,
     NO_PROGRESS,
-    FLASH
+    FLASH,
 }
 
 @Entity(
-        tableName = "attempts",
-        foreignKeys =
-                [
-                        ForeignKey(
-                                entity = ClimbSession::class,
-                                parentColumns = ["id"],
-                                childColumns = ["sessionId"],
-                                onDelete = ForeignKey.CASCADE
-                        ),
-                        ForeignKey(
-                                entity = Problem::class,
-                                parentColumns = ["id"],
-                                childColumns = ["problemId"],
-                                onDelete = ForeignKey.CASCADE
-                        )],
-        indices = [Index(value = ["sessionId"]), Index(value = ["problemId"])]
+    tableName = "attempts",
+    foreignKeys =
+    [
+        ForeignKey(
+            entity = ClimbSession::class,
+            parentColumns = ["id"],
+            childColumns = ["sessionId"],
+            onDelete = ForeignKey.CASCADE,
+        ),
+        ForeignKey(
+            entity = Problem::class,
+            parentColumns = ["id"],
+            childColumns = ["problemId"],
+            onDelete = ForeignKey.CASCADE,
+        ),
+    ],
+    indices = [Index(value = ["sessionId"]), Index(value = ["problemId"])],
 )
+@Immutable
 @Serializable
 data class Attempt(
-        @PrimaryKey val id: String,
-        val sessionId: String,
-        val problemId: String,
-        val result: AttemptResult,
-        val highestHold: String? = null,
-        val notes: String? = null,
-        val duration: Long? = null,
-        val restTime: Long? = null,
-        val timestamp: String,
-        val createdAt: String,
-        val updatedAt: String
+    @PrimaryKey val id: String,
+    val sessionId: String,
+    val problemId: String,
+    val result: AttemptResult,
+    val highestHold: String? = null,
+    val notes: String? = null,
+    val duration: Long? = null,
+    val restTime: Long? = null,
+    val timestamp: String,
+    val createdAt: String,
+    val updatedAt: String,
 ) {
     companion object {
         fun create(
-                sessionId: String,
-                problemId: String,
-                result: AttemptResult,
-                highestHold: String? = null,
-                notes: String? = null,
-                duration: Long? = null,
-                restTime: Long? = null,
-                timestamp: String = DateFormatUtils.nowISO8601()
+            sessionId: String,
+            problemId: String,
+            result: AttemptResult,
+            highestHold: String? = null,
+            notes: String? = null,
+            duration: Long? = null,
+            restTime: Long? = null,
+            timestamp: String = DateFormatUtils.nowISO8601(),
         ): Attempt {
             val now = DateFormatUtils.nowISO8601()
             return Attempt(
-                    id = java.util.UUID.randomUUID().toString(),
-                    sessionId = sessionId,
-                    problemId = problemId,
-                    result = result,
-                    highestHold = highestHold,
-                    notes = notes,
-                    duration = duration,
-                    restTime = restTime,
-                    timestamp = timestamp,
-                    createdAt = now,
-                    updatedAt = now
+                id = java.util.UUID.randomUUID().toString(),
+                sessionId = sessionId,
+                problemId = problemId,
+                result = result,
+                highestHold = highestHold,
+                notes = notes,
+                duration = duration,
+                restTime = restTime,
+                timestamp = timestamp,
+                createdAt = now,
+                updatedAt = now,
             )
         }
     }

android/app/src/main/java/com/atridad/ascently/data/model/ClimbSession.kt

@@ -1,5 +1,6 @@
 package com.atridad.ascently.data.model
 
+import androidx.compose.runtime.Immutable
 import androidx.room.Entity
 import androidx.room.ForeignKey
 import androidx.room.Index
@@ -11,69 +12,75 @@ import kotlinx.serialization.Serializable
 enum class SessionStatus {
     ACTIVE,
     COMPLETED,
-    PAUSED
+    PAUSED,
 }
 
 @Entity(
-        tableName = "climb_sessions",
-        foreignKeys =
-                [
-                        ForeignKey(
-                                entity = Gym::class,
-                                parentColumns = ["id"],
-                                childColumns = ["gymId"],
-                                onDelete = ForeignKey.CASCADE
-                        )],
-        indices = [Index(value = ["gymId"])]
+    tableName = "climb_sessions",
+    foreignKeys =
+    [
+        ForeignKey(
+            entity = Gym::class,
+            parentColumns = ["id"],
+            childColumns = ["gymId"],
+            onDelete = ForeignKey.CASCADE,
+        ),
+    ],
+    indices = [Index(value = ["gymId"])],
 )
+@Immutable
 @Serializable
 data class ClimbSession(
-        @PrimaryKey val id: String,
-        val gymId: String,
-        val date: String,
-        val startTime: String? = null,
-        val endTime: String? = null,
-        val duration: Long? = null,
-        val status: SessionStatus = SessionStatus.ACTIVE,
-        val notes: String? = null,
-        val createdAt: String,
-        val updatedAt: String
+    @PrimaryKey val id: String,
+    val gymId: String,
+    val date: String,
+    val startTime: String? = null,
+    val endTime: String? = null,
+    val duration: Long? = null,
+    val status: SessionStatus = SessionStatus.ACTIVE,
+    val notes: String? = null,
+    val createdAt: String,
+    val updatedAt: String,
 ) {
     companion object {
         fun create(gymId: String, notes: String? = null): ClimbSession {
             val now = DateFormatUtils.nowISO8601()
             return ClimbSession(
-                    id = java.util.UUID.randomUUID().toString(),
-                    gymId = gymId,
-                    date = now,
-                    startTime = now,
-                    status = SessionStatus.ACTIVE,
-                    notes = notes,
-                    createdAt = now,
-                    updatedAt = now
+                id = java.util.UUID.randomUUID().toString(),
+                gymId = gymId,
+                date = now,
+                startTime = now,
+                status = SessionStatus.ACTIVE,
+                notes = notes,
+                createdAt = now,
+                updatedAt = now,
             )
         }
 
         fun ClimbSession.complete(): ClimbSession {
             val endTime = DateFormatUtils.nowISO8601()
             val durationMinutes =
-                    if (startTime != null) {
-                        try {
-                            val start = DateFormatUtils.parseISO8601(startTime)
-                            val end = DateFormatUtils.parseISO8601(endTime)
-                            if (start != null && end != null) {
-                                java.time.Duration.between(start, end).toMinutes()
-                            } else null
-                        } catch (_: Exception) {
+                if (startTime != null) {
+                    try {
+                        val start = DateFormatUtils.parseISO8601(startTime)
+                        val end = DateFormatUtils.parseISO8601(endTime)
+                        if (start != null && end != null) {
+                            java.time.Duration.between(start, end).toMinutes()
+                        } else {
                             null
                         }
-                    } else null
+                    } catch (_: Exception) {
+                        null
+                    }
+                } else {
+                    null
+                }
 
             return this.copy(
-                    endTime = endTime,
-                    duration = durationMinutes,
-                    status = SessionStatus.COMPLETED,
-                    updatedAt = DateFormatUtils.nowISO8601()
+                endTime = endTime,
+                duration = durationMinutes,
+                status = SessionStatus.COMPLETED,
+                updatedAt = DateFormatUtils.nowISO8601(),
             )
         }
     }

android/app/src/main/java/com/atridad/ascently/data/model/ClimbType.kt

@@ -5,12 +5,13 @@ import kotlinx.serialization.Serializable
 @Serializable
 enum class ClimbType {
     ROPE,
-    BOULDER;
+    BOULDER,
+    ;
 
     val displayName: String
         get() =
-                when (this) {
-                    ROPE -> "Rope"
-                    BOULDER -> "Bouldering"
-                }
+            when (this) {
+                ROPE -> "Rope"
+                BOULDER -> "Bouldering"
+            }
 }

android/app/src/main/java/com/atridad/ascently/data/model/DifficultySystem.kt

@@ -10,132 +10,133 @@ enum class DifficultySystem {
 
     // Rope
     YDS,
-    CUSTOM;
+    CUSTOM,
+    ;
 
     val displayName: String
         get() =
-                when (this) {
-                    V_SCALE -> "V Scale"
-                    FONT -> "Font Scale"
-                    YDS -> "YDS (Yosemite)"
-                    CUSTOM -> "Custom"
-                }
+            when (this) {
+                V_SCALE -> "V Scale"
+                FONT -> "Font Scale"
+                YDS -> "YDS (Yosemite)"
+                CUSTOM -> "Custom"
+            }
 
     val isBoulderingSystem: Boolean
         get() =
-                when (this) {
-                    V_SCALE, FONT -> true
-                    YDS -> false
-                    CUSTOM -> true
-                }
+            when (this) {
+                V_SCALE, FONT -> true
+                YDS -> false
+                CUSTOM -> true
+            }
 
     val isRopeSystem: Boolean
         get() =
-                when (this) {
-                    YDS -> true
-                    V_SCALE, FONT -> false
-                    CUSTOM -> true
-                }
+            when (this) {
+                YDS -> true
+                V_SCALE, FONT -> false
+                CUSTOM -> true
+            }
 
     val availableGrades: List<String>
         get() =
-                when (this) {
-                    V_SCALE ->
-                            listOf(
-                                    "VB",
-                                    "V0",
-                                    "V1",
-                                    "V2",
-                                    "V3",
-                                    "V4",
-                                    "V5",
-                                    "V6",
-                                    "V7",
-                                    "V8",
-                                    "V9",
-                                    "V10",
-                                    "V11",
-                                    "V12",
-                                    "V13",
-                                    "V14",
-                                    "V15",
-                                    "V16",
-                                    "V17"
-                            )
-                    FONT ->
-                            listOf(
-                                    "3",
-                                    "4A",
-                                    "4B",
-                                    "4C",
-                                    "5A",
-                                    "5B",
-                                    "5C",
-                                    "6A",
-                                    "6A+",
-                                    "6B",
-                                    "6B+",
-                                    "6C",
-                                    "6C+",
-                                    "7A",
-                                    "7A+",
-                                    "7B",
-                                    "7B+",
-                                    "7C",
-                                    "7C+",
-                                    "8A",
-                                    "8A+",
-                                    "8B",
-                                    "8B+",
-                                    "8C",
-                                    "8C+"
-                            )
-                    YDS ->
-                            listOf(
-                                    "5.0",
-                                    "5.1",
-                                    "5.2",
-                                    "5.3",
-                                    "5.4",
-                                    "5.5",
-                                    "5.6",
-                                    "5.7",
-                                    "5.8",
-                                    "5.9",
-                                    "5.10a",
-                                    "5.10b",
-                                    "5.10c",
-                                    "5.10d",
-                                    "5.11a",
-                                    "5.11b",
-                                    "5.11c",
-                                    "5.11d",
-                                    "5.12a",
-                                    "5.12b",
-                                    "5.12c",
-                                    "5.12d",
-                                    "5.13a",
-                                    "5.13b",
-                                    "5.13c",
-                                    "5.13d",
-                                    "5.14a",
-                                    "5.14b",
-                                    "5.14c",
-                                    "5.14d",
-                                    "5.15a",
-                                    "5.15b",
-                                    "5.15c",
-                                    "5.15d"
-                            )
-                    CUSTOM -> emptyList()
-                }
+            when (this) {
+                V_SCALE ->
+                    listOf(
+                        "VB",
+                        "V0",
+                        "V1",
+                        "V2",
+                        "V3",
+                        "V4",
+                        "V5",
+                        "V6",
+                        "V7",
+                        "V8",
+                        "V9",
+                        "V10",
+                        "V11",
+                        "V12",
+                        "V13",
+                        "V14",
+                        "V15",
+                        "V16",
+                        "V17",
+                    )
+                FONT ->
+                    listOf(
+                        "3",
+                        "4A",
+                        "4B",
+                        "4C",
+                        "5A",
+                        "5B",
+                        "5C",
+                        "6A",
+                        "6A+",
+                        "6B",
+                        "6B+",
+                        "6C",
+                        "6C+",
+                        "7A",
+                        "7A+",
+                        "7B",
+                        "7B+",
+                        "7C",
+                        "7C+",
+                        "8A",
+                        "8A+",
+                        "8B",
+                        "8B+",
+                        "8C",
+                        "8C+",
+                    )
+                YDS ->
+                    listOf(
+                        "5.0",
+                        "5.1",
+                        "5.2",
+                        "5.3",
+                        "5.4",
+                        "5.5",
+                        "5.6",
+                        "5.7",
+                        "5.8",
+                        "5.9",
+                        "5.10a",
+                        "5.10b",
+                        "5.10c",
+                        "5.10d",
+                        "5.11a",
+                        "5.11b",
+                        "5.11c",
+                        "5.11d",
+                        "5.12a",
+                        "5.12b",
+                        "5.12c",
+                        "5.12d",
+                        "5.13a",
+                        "5.13b",
+                        "5.13c",
+                        "5.13d",
+                        "5.14a",
+                        "5.14b",
+                        "5.14c",
+                        "5.14d",
+                        "5.15a",
+                        "5.15b",
+                        "5.15c",
+                        "5.15d",
+                    )
+                CUSTOM -> emptyList()
+            }
 
     companion object {
         fun systemsForClimbType(climbType: ClimbType): List<DifficultySystem> =
-                when (climbType) {
-                    ClimbType.BOULDER -> entries.filter { it.isBoulderingSystem }
-                    ClimbType.ROPE -> entries.filter { it.isRopeSystem }
-                }
+            when (climbType) {
+                ClimbType.BOULDER -> entries.filter { it.isBoulderingSystem }
+                ClimbType.ROPE -> entries.filter { it.isRopeSystem }
+            }
     }
 }
 
@@ -143,8 +144,8 @@ enum class DifficultySystem {
 data class DifficultyGrade(val system: DifficultySystem, val grade: String, val numericValue: Int) {
 
     constructor(
-            system: DifficultySystem,
-            grade: String
+        system: DifficultySystem,
+        grade: String,
     ) : this(system = system, grade = grade, numericValue = calculateNumericValue(system, grade))
 
     companion object {
@@ -155,79 +156,80 @@ data class DifficultyGrade(val system: DifficultySystem, val grade: String, val
                 }
                 DifficultySystem.FONT -> {
                     val fontMapping: Map<String, Int> =
-                            mapOf(
-                                    "3" to 3,
-                                    "4A" to 4,
-                                    "4B" to 5,
-                                    "4C" to 6,
-                                    "5A" to 7,
-                                    "5B" to 8,
-                                    "5C" to 9,
-                                    "6A" to 10,
-                                    "6A+" to 11,
-                                    "6B" to 12,
-                                    "6B+" to 13,
-                                    "6C" to 14,
-                                    "6C+" to 15,
-                                    "7A" to 16,
-                                    "7A+" to 17,
-                                    "7B" to 18,
-                                    "7B+" to 19,
-                                    "7C" to 20,
-                                    "7C+" to 21,
-                                    "8A" to 22,
-                                    "8A+" to 23,
-                                    "8B" to 24,
-                                    "8B+" to 25,
-                                    "8C" to 26,
-                                    "8C+" to 27
-                            )
+                        mapOf(
+                            "3" to 3,
+                            "4A" to 4,
+                            "4B" to 5,
+                            "4C" to 6,
+                            "5A" to 7,
+                            "5B" to 8,
+                            "5C" to 9,
+                            "6A" to 10,
+                            "6A+" to 11,
+                            "6B" to 12,
+                            "6B+" to 13,
+                            "6C" to 14,
+                            "6C+" to 15,
+                            "7A" to 16,
+                            "7A+" to 17,
+                            "7B" to 18,
+                            "7B+" to 19,
+                            "7C" to 20,
+                            "7C+" to 21,
+                            "8A" to 22,
+                            "8A+" to 23,
+                            "8B" to 24,
+                            "8B+" to 25,
+                            "8C" to 26,
+                            "8C+" to 27,
+                        )
                     fontMapping[grade] ?: 0
                 }
                 DifficultySystem.YDS -> {
                     val ydsMapping: Map<String, Int> =
-                            mapOf(
-                                    "5.0" to 50,
-                                    "5.1" to 51,
-                                    "5.2" to 52,
-                                    "5.3" to 53,
-                                    "5.4" to 54,
-                                    "5.5" to 55,
-                                    "5.6" to 56,
-                                    "5.7" to 57,
-                                    "5.8" to 58,
-                                    "5.9" to 59,
-                                    "5.10a" to 60,
-                                    "5.10b" to 61,
-                                    "5.10c" to 62,
-                                    "5.10d" to 63,
-                                    "5.11a" to 64,
-                                    "5.11b" to 65,
-                                    "5.11c" to 66,
-                                    "5.11d" to 67,
-                                    "5.12a" to 68,
-                                    "5.12b" to 69,
-                                    "5.12c" to 70,
-                                    "5.12d" to 71,
-                                    "5.13a" to 72,
-                                    "5.13b" to 73,
-                                    "5.13c" to 74,
-                                    "5.13d" to 75,
-                                    "5.14a" to 76,
-                                    "5.14b" to 77,
-                                    "5.14c" to 78,
-                                    "5.14d" to 79,
-                                    "5.15a" to 80,
-                                    "5.15b" to 81,
-                                    "5.15c" to 82,
-                                    "5.15d" to 83
-                            )
+                        mapOf(
+                            "5.0" to 50,
+                            "5.1" to 51,
+                            "5.2" to 52,
+                            "5.3" to 53,
+                            "5.4" to 54,
+                            "5.5" to 55,
+                            "5.6" to 56,
+                            "5.7" to 57,
+                            "5.8" to 58,
+                            "5.9" to 59,
+                            "5.10a" to 60,
+                            "5.10b" to 61,
+                            "5.10c" to 62,
+                            "5.10d" to 63,
+                            "5.11a" to 64,
+                            "5.11b" to 65,
+                            "5.11c" to 66,
+                            "5.11d" to 67,
+                            "5.12a" to 68,
+                            "5.12b" to 69,
+                            "5.12c" to 70,
+                            "5.12d" to 71,
+                            "5.13a" to 72,
+                            "5.13b" to 73,
+                            "5.13c" to 74,
+                            "5.13d" to 75,
+                            "5.14a" to 76,
+                            "5.14b" to 77,
+                            "5.14c" to 78,
+                            "5.14d" to 79,
+                            "5.15a" to 80,
+                            "5.15b" to 81,
+                            "5.15c" to 82,
+                            "5.15d" to 83,
+                        )
                     ydsMapping[grade] ?: 0
                 }
                 DifficultySystem.CUSTOM -> grade.toIntOrNull() ?: 0
             }
         }
     }
+
     /**
      * Compare this grade with another grade of the same system Returns negative if this grade is
      * easier, positive if harder, 0 if equal

android/app/src/main/java/com/atridad/ascently/data/model/Gym.kt

@@ -1,43 +1,45 @@
 package com.atridad.ascently.data.model
 
+import androidx.compose.runtime.Immutable
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import com.atridad.ascently.utils.DateFormatUtils
 import kotlinx.serialization.Serializable
 
+@Immutable
 @Entity(tableName = "gyms")
 @Serializable
 data class Gym(
-        @PrimaryKey val id: String,
-        val name: String,
-        val location: String? = null,
-        val supportedClimbTypes: List<ClimbType>,
-        val difficultySystems: List<DifficultySystem>,
-        val customDifficultyGrades: List<String> = emptyList(),
-        val notes: String? = null,
-        val createdAt: String,
-        val updatedAt: String
+    @PrimaryKey val id: String,
+    val name: String,
+    val location: String? = null,
+    val supportedClimbTypes: List<ClimbType>,
+    val difficultySystems: List<DifficultySystem>,
+    val customDifficultyGrades: List<String> = emptyList(),
+    val notes: String? = null,
+    val createdAt: String,
+    val updatedAt: String,
 ) {
     companion object {
         fun create(
-                name: String,
-                location: String? = null,
-                supportedClimbTypes: List<ClimbType>,
-                difficultySystems: List<DifficultySystem>,
-                customDifficultyGrades: List<String> = emptyList(),
-                notes: String? = null
+            name: String,
+            location: String? = null,
+            supportedClimbTypes: List<ClimbType>,
+            difficultySystems: List<DifficultySystem>,
+            customDifficultyGrades: List<String> = emptyList(),
+            notes: String? = null,
         ): Gym {
             val now = DateFormatUtils.nowISO8601()
             return Gym(
-                    id = java.util.UUID.randomUUID().toString(),
-                    name = name,
-                    location = location,
-                    supportedClimbTypes = supportedClimbTypes,
-                    difficultySystems = difficultySystems,
-                    customDifficultyGrades = customDifficultyGrades,
-                    notes = notes,
-                    createdAt = now,
-                    updatedAt = now
+                id = java.util.UUID.randomUUID().toString(),
+                name = name,
+                location = location,
+                supportedClimbTypes = supportedClimbTypes,
+                difficultySystems = difficultySystems,
+                customDifficultyGrades = customDifficultyGrades,
+                notes = notes,
+                createdAt = now,
+                updatedAt = now,
             )
         }
     }

android/app/src/main/java/com/atridad/ascently/data/model/Problem.kt

@@ -1,5 +1,6 @@
 package com.atridad.ascently.data.model
 
+import androidx.compose.runtime.Immutable
 import androidx.room.Entity
 import androidx.room.ForeignKey
 import androidx.room.Index
@@ -7,64 +8,66 @@ import androidx.room.PrimaryKey
 import com.atridad.ascently.utils.DateFormatUtils
 import kotlinx.serialization.Serializable
 
+@Immutable
 @Entity(
-        tableName = "problems",
-        foreignKeys =
-                [
-                        ForeignKey(
-                                entity = Gym::class,
-                                parentColumns = ["id"],
-                                childColumns = ["gymId"],
-                                onDelete = ForeignKey.CASCADE
-                        )],
-        indices = [Index(value = ["gymId"])]
+    tableName = "problems",
+    foreignKeys =
+    [
+        ForeignKey(
+            entity = Gym::class,
+            parentColumns = ["id"],
+            childColumns = ["gymId"],
+            onDelete = ForeignKey.CASCADE,
+        ),
+    ],
+    indices = [Index(value = ["gymId"])],
 )
 @Serializable
 data class Problem(
-        @PrimaryKey val id: String,
-        val gymId: String,
-        val name: String? = null,
-        val description: String? = null,
-        val climbType: ClimbType,
-        val difficulty: DifficultyGrade,
-        val tags: List<String> = emptyList(),
-        val location: String? = null,
-        val imagePaths: List<String> = emptyList(),
-        val isActive: Boolean = true,
-        val dateSet: String? = null,
-        val notes: String? = null,
-        val createdAt: String,
-        val updatedAt: String
+    @PrimaryKey val id: String,
+    val gymId: String,
+    val name: String? = null,
+    val description: String? = null,
+    val climbType: ClimbType,
+    val difficulty: DifficultyGrade,
+    val tags: List<String> = emptyList(),
+    val location: String? = null,
+    val imagePaths: List<String> = emptyList(),
+    val isActive: Boolean = true,
+    val dateSet: String? = null,
+    val notes: String? = null,
+    val createdAt: String,
+    val updatedAt: String,
 ) {
     companion object {
         fun create(
-                gymId: String,
-                name: String? = null,
-                description: String? = null,
-                climbType: ClimbType,
-                difficulty: DifficultyGrade,
-                tags: List<String> = emptyList(),
-                location: String? = null,
-                imagePaths: List<String> = emptyList(),
-                dateSet: String? = null,
-                notes: String? = null
+            gymId: String,
+            name: String? = null,
+            description: String? = null,
+            climbType: ClimbType,
+            difficulty: DifficultyGrade,
+            tags: List<String> = emptyList(),
+            location: String? = null,
+            imagePaths: List<String> = emptyList(),
+            dateSet: String? = null,
+            notes: String? = null,
         ): Problem {
             val now = DateFormatUtils.nowISO8601()
             return Problem(
-                    id = java.util.UUID.randomUUID().toString(),
-                    gymId = gymId,
-                    name = name,
-                    description = description,
-                    climbType = climbType,
-                    difficulty = difficulty,
-                    tags = tags,
-                    location = location,
-                    imagePaths = imagePaths,
-                    isActive = true,
-                    dateSet = dateSet,
-                    notes = notes,
-                    createdAt = now,
-                    updatedAt = now
+                id = java.util.UUID.randomUUID().toString(),
+                gymId = gymId,
+                name = name,
+                description = description,
+                climbType = climbType,
+                difficulty = difficulty,
+                tags = tags,
+                location = location,
+                imagePaths = imagePaths,
+                isActive = true,
+                dateSet = dateSet,
+                notes = notes,
+                createdAt = now,
+                updatedAt = now,
             )
         }
     }

android/app/src/main/java/com/atridad/ascently/data/repository/ClimbRepository.kt

@@ -12,13 +12,14 @@ import com.atridad.ascently.data.format.ClimbDataBackup
 import com.atridad.ascently.data.format.DeletedItem
 import com.atridad.ascently.data.model.*
 import com.atridad.ascently.data.state.DataStateManager
-import com.atridad.ascently.utils.DateFormatUtils
 import com.atridad.ascently.utils.AppLogger
+import com.atridad.ascently.utils.DateFormatUtils
 import com.atridad.ascently.utils.ZipExportImportUtils
-import java.io.File
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.serialization.json.Json
+import java.io.File
+import java.time.Instant
 
 class ClimbRepository(database: AscentlyDatabase, private val context: Context) {
     private val gymDao = database.gymDao()
@@ -38,6 +39,7 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
 
     // Gym operations
     fun getAllGyms(): Flow<List<Gym>> = gymDao.getAllGyms()
+    suspend fun getAllGymsSync(): List<Gym> = gymDao.getAllGyms().first()
     suspend fun getGymById(id: String): Gym? = gymDao.getGymById(id)
     suspend fun insertGym(gym: Gym) {
         gymDao.insertGym(gym)
@@ -60,6 +62,7 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
 
     // Problem operations
     fun getAllProblems(): Flow<List<Problem>> = problemDao.getAllProblems()
+    suspend fun getAllProblemsSync(): List<Problem> = problemDao.getAllProblems().first()
     suspend fun getProblemById(id: String): Problem? = problemDao.getProblemById(id)
     fun getProblemsByGym(gymId: String): Flow<List<Problem>> = problemDao.getProblemsByGym(gymId)
     suspend fun insertProblem(problem: Problem) {
@@ -80,6 +83,7 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
 
     // Session operations
     fun getAllSessions(): Flow<List<ClimbSession>> = sessionDao.getAllSessions()
+    suspend fun getAllSessionsSync(): List<ClimbSession> = sessionDao.getAllSessions().first()
     suspend fun getSessionById(id: String): ClimbSession? = sessionDao.getSessionById(id)
     fun getSessionsByGym(gymId: String): Flow<List<ClimbSession>> =
         sessionDao.getSessionsByGym(gymId)
@@ -122,6 +126,8 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
 
     // Attempt operations
     fun getAllAttempts(): Flow<List<Attempt>> = attemptDao.getAllAttempts()
+    suspend fun getAllAttemptsSync(): List<Attempt> = attemptDao.getAllAttempts().first()
+    suspend fun getAttemptById(id: String): Attempt? = attemptDao.getAttemptById(id)
     fun getAttemptsBySession(sessionId: String): Flow<List<Attempt>> =
         attemptDao.getAttemptsBySession(sessionId)
 
@@ -161,7 +167,7 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
                     gyms = allGyms.map { BackupGym.fromGym(it) },
                     problems = allProblems.map { BackupProblem.fromProblem(it) },
                     sessions = allSessions.map { BackupClimbSession.fromClimbSession(it) },
-                    attempts = allAttempts.map { BackupAttempt.fromAttempt(it) }
+                    attempts = allAttempts.map { BackupAttempt.fromAttempt(it) },
                 )
 
             val referencedImagePaths = allProblems.flatMap { it.imagePaths }.toSet()
@@ -172,7 +178,7 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
                             val imageFile =
                                 com.atridad.ascently.utils.ImageUtils.getImageFile(
                                     context,
-                                    imagePath
+                                    imagePath,
                                 )
                             imageFile.exists() && imageFile.length() > 0
                         } catch (_: Exception) {
@@ -185,7 +191,7 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
                 context = context,
                 uri = uri,
                 exportData = backupData,
-                referencedImagePaths = validImagePaths
+                referencedImagePaths = validImagePaths,
             )
         } catch (e: Exception) {
             throw Exception("Export failed: ${e.message}")
@@ -229,7 +235,7 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
             val updatedBackupProblems =
                 ZipExportImportUtils.updateProblemImagePaths(
                     importData.problems,
-                    importResult.importedImagePaths
+                    importResult.importedImagePaths,
                 )
 
             updatedBackupProblems.forEach { backupProblem ->
@@ -237,7 +243,7 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
                     problemDao.insertProblem(backupProblem.toProblem())
                 } catch (e: Exception) {
                     throw Exception(
-                        "Failed to import problem '${backupProblem.name}': ${e.message}"
+                        "Failed to import problem '${backupProblem.name}': ${e.message}",
                     )
                 }
             }
@@ -273,13 +279,12 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
     }
 
     fun trackDeletion(itemId: String, itemType: String) {
-        val currentDeletions = getDeletedItems().toMutableList()
+        cleanupOldDeletions()
         val newDeletion =
             DeletedItem(id = itemId, type = itemType, deletedAt = DateFormatUtils.nowISO8601())
-        currentDeletions.add(newDeletion)
 
         val json = json.encodeToString(newDeletion)
-        deletionPreferences.edit { putString("deleted_${itemId}", json) }
+        deletionPreferences.edit { putString("deleted_$itemId", json) }
     }
 
     fun getDeletedItems(): List<DeletedItem> {
@@ -304,24 +309,45 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
         deletionPreferences.edit { clear() }
     }
 
+    private fun cleanupOldDeletions() {
+        val allPrefs = deletionPreferences.all
+        val cutoff = Instant.now().minusSeconds(90L * 24 * 60 * 60)
+
+        deletionPreferences.edit {
+            for ((key, value) in allPrefs) {
+                if (key.startsWith("deleted_") && value is String) {
+                    try {
+                        val deletion = json.decodeFromString<DeletedItem>(value)
+                        val deletedAt = Instant.parse(deletion.deletedAt)
+                        if (deletedAt.isBefore(cutoff)) {
+                            remove(key)
+                        }
+                    } catch (_: Exception) {
+                        // Ignore
+                    }
+                }
+            }
+        }
+    }
+
     private fun validateDataIntegrity(
         gyms: List<Gym>,
         problems: List<Problem>,
         sessions: List<ClimbSession>,
-        attempts: List<Attempt>
+        attempts: List<Attempt>,
     ) {
         val gymIds = gyms.map { it.id }.toSet()
         val invalidProblems = problems.filter { it.gymId !in gymIds }
         if (invalidProblems.isNotEmpty()) {
             throw Exception(
-                "Data integrity error: ${invalidProblems.size} problems reference non-existent gyms"
+                "Data integrity error: ${invalidProblems.size} problems reference non-existent gyms",
             )
         }
 
         val invalidSessions = sessions.filter { it.gymId !in gymIds }
         if (invalidSessions.isNotEmpty()) {
             throw Exception(
-                "Data integrity error: ${invalidSessions.size} sessions reference non-existent gyms"
+                "Data integrity error: ${invalidSessions.size} sessions reference non-existent gyms",
             )
         }
 
@@ -332,7 +358,7 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
             attempts.filter { it.problemId !in problemIds || it.sessionId !in sessionIds }
         if (invalidAttempts.isNotEmpty()) {
             throw Exception(
-                "Data integrity error: ${invalidAttempts.size} attempts reference non-existent problems or sessions"
+                "Data integrity error: ${invalidAttempts.size} attempts reference non-existent problems or sessions",
             )
         }
     }

android/app/src/main/java/com/atridad/ascently/data/sync/AscentlySyncProvider.kt

@@ -0,0 +1,649 @@
+package com.atridad.ascently.data.sync
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.net.ConnectivityManager
+import android.net.NetworkCapabilities
+import android.util.Log
+import com.atridad.ascently.data.format.BackupAttempt
+import com.atridad.ascently.data.format.BackupClimbSession
+import com.atridad.ascently.data.format.BackupGym
+import com.atridad.ascently.data.format.BackupProblem
+import com.atridad.ascently.data.format.ClimbDataBackup
+import com.atridad.ascently.data.repository.ClimbRepository
+import com.atridad.ascently.data.state.DataStateManager
+import com.atridad.ascently.utils.AppLogger
+import com.atridad.ascently.utils.DateFormatUtils
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.withContext
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.toRequestBody
+import java.io.File
+import java.io.IOException
+import java.time.Instant
+import java.util.concurrent.TimeUnit
+
+class AscentlySyncProvider(
+    private val context: Context,
+    private val repository: ClimbRepository,
+    private val dataStateManager: DataStateManager
+) : SyncProvider {
+
+    override val type = SyncProviderType.SERVER
+
+    companion object {
+        private const val TAG = "AscentlySyncProvider"
+    }
+
+    private val sharedPreferences: SharedPreferences =
+        context.getSharedPreferences("ascently_prefs", Context.MODE_PRIVATE)
+
+    private val httpClient =
+        OkHttpClient.Builder()
+            .connectTimeout(45, TimeUnit.SECONDS)
+            .readTimeout(90, TimeUnit.SECONDS)
+            .writeTimeout(90, TimeUnit.SECONDS)
+            .build()
+
+    private val json = Json {
+        prettyPrint = true
+        ignoreUnknownKeys = true
+        encodeDefaults = true
+        isLenient = true
+    }
+
+    private val _isConnected = MutableStateFlow(false)
+    override val isConnected: StateFlow<Boolean> = _isConnected.asStateFlow()
+
+    private val _isConfigured = MutableStateFlow(false)
+    override val isConfigured: StateFlow<Boolean> = _isConfigured.asStateFlow()
+
+    var isOfflineMode: Boolean
+        get() = sharedPreferences.getBoolean(Keys.OFFLINE_MODE, false)
+        set(value) = sharedPreferences.edit().putBoolean(Keys.OFFLINE_MODE, value).apply()
+
+    object Keys {
+        const val SERVER_URL = "sync_server_url"
+        const val AUTH_TOKEN = "sync_auth_token"
+        const val IS_CONNECTED = "is_connected"
+        const val LAST_SYNC_TIME = "last_sync_time"
+        const val OFFLINE_MODE = "offline_mode"
+    }
+
+    init {
+        loadInitialState()
+    }
+
+    private fun loadInitialState() {
+        _isConnected.value = sharedPreferences.getBoolean(Keys.IS_CONNECTED, false)
+        updateConfiguredState()
+    }
+
+    private fun updateConfiguredState() {
+        val url = serverUrl
+        val token = authToken
+        _isConfigured.value = url.isNotBlank() && token.isNotBlank()
+    }
+
+    var serverUrl: String
+        get() = sharedPreferences.getString(Keys.SERVER_URL, "") ?: ""
+        set(value) {
+            sharedPreferences.edit().putString(Keys.SERVER_URL, value).apply()
+            updateConfiguredState()
+        }
+
+    var authToken: String
+        get() = sharedPreferences.getString(Keys.AUTH_TOKEN, "") ?: ""
+        set(value) {
+            sharedPreferences.edit().putString(Keys.AUTH_TOKEN, value).apply()
+            updateConfiguredState()
+        }
+
+    private fun isNetworkAvailable(): Boolean {
+        val connectivityManager =
+            context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+        val network = connectivityManager.activeNetwork ?: return false
+        val activeNetwork = connectivityManager.getNetworkCapabilities(network) ?: return false
+
+        return when {
+            activeNetwork.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> true
+            activeNetwork.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> true
+            activeNetwork.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) -> true
+            else -> false
+        }
+    }
+
+    override suspend fun sync() = withContext(Dispatchers.IO) {
+        if (isOfflineMode) {
+            AppLogger.i(TAG) { "Sync skipped: Offline mode is enabled." }
+            return@withContext
+        }
+
+        if (!isConfigured.value) {
+            throw SyncException.NotConfigured
+        }
+
+        if (!isNetworkAvailable()) {
+            throw SyncException.NotConnected
+        }
+
+        val lastSyncTimeStr = sharedPreferences.getString(Keys.LAST_SYNC_TIME, null)
+
+        if (lastSyncTimeStr != null) {
+            AppLogger.i(TAG) { "Last sync time found ($lastSyncTimeStr), attempting delta sync" }
+            try {
+                performDeltaSync()
+                sharedPreferences.edit()
+                    .putString(Keys.LAST_SYNC_TIME, DateFormatUtils.nowISO8601())
+                    .apply()
+                return@withContext
+            } catch (e: Exception) {
+                AppLogger.e(TAG, e) { "Delta sync failed, falling back to full sync check: ${e.message}" }
+            }
+        }
+
+        val localBackup = createBackupFromRepository()
+        val serverBackup = try {
+            downloadData()
+        } catch (e: Exception) {
+            AppLogger.e(TAG, e) { "Failed to download data: ${e.message}" }
+            throw e
+        }
+
+        val hasLocalData = localBackup.gyms.isNotEmpty() ||
+                           localBackup.problems.isNotEmpty() ||
+                           localBackup.sessions.isNotEmpty() ||
+                           localBackup.attempts.isNotEmpty()
+
+        val hasServerData = serverBackup.gyms.isNotEmpty() ||
+                            serverBackup.problems.isNotEmpty() ||
+                            serverBackup.sessions.isNotEmpty() ||
+                            serverBackup.attempts.isNotEmpty()
+
+        if (!hasLocalData && hasServerData) {
+            AppLogger.i(TAG) { "Performing full restore from server" }
+            AppLogger.i(TAG) { "Syncing images from server first..." }
+            val imagePathMapping = syncImagesFromServer(serverBackup)
+
+            AppLogger.i(TAG) { "Importing data after images..." }
+            importBackupToRepository(serverBackup, imagePathMapping)
+            AppLogger.i(TAG) { "Full restore completed" }
+        } else if (hasLocalData && !hasServerData) {
+            AppLogger.i(TAG) { "Uploading local data to server" }
+            uploadData(localBackup)
+            AppLogger.i(TAG) { "Uploading local images to server..." }
+            syncImagesToServer()
+            AppLogger.i(TAG) { "Initial upload completed" }
+        } else if (hasLocalData && hasServerData) {
+            AppLogger.i(TAG) { "Merging local and server data" }
+            mergeDataSafely(localBackup, serverBackup)
+            AppLogger.i(TAG) { "Safe merge completed" }
+        } else {
+            AppLogger.i(TAG) { "No data to sync" }
+        }
+
+        sharedPreferences.edit()
+            .putString(Keys.LAST_SYNC_TIME, DateFormatUtils.nowISO8601())
+            .apply()
+    }
+
+    override fun disconnect() {
+        _isConnected.value = false
+        sharedPreferences.edit()
+            .remove(Keys.LAST_SYNC_TIME)
+            .putBoolean(Keys.IS_CONNECTED, false)
+            .apply()
+    }
+
+    private suspend fun performDeltaSync() {
+        val lastSyncTimeStr = sharedPreferences.getString(Keys.LAST_SYNC_TIME, null)
+            ?: throw SyncException.General("No last sync time for delta sync")
+
+        val lastSyncDate = parseISO8601(lastSyncTimeStr) ?: Instant.EPOCH
+
+        val allGyms = repository.getAllGymsSync()
+        val modifiedGyms = allGyms.filter {
+            (parseISO8601(it.updatedAt) ?: Instant.MIN).isAfter(lastSyncDate)
+        }.map { BackupGym.fromGym(it) }.toMutableList()
+
+        val allProblems = repository.getAllProblemsSync()
+        val modifiedProblems = allProblems.filter {
+            (parseISO8601(it.updatedAt) ?: Instant.MIN).isAfter(lastSyncDate)
+        }.map { problem ->
+            val backupProblem = BackupProblem.fromProblem(problem)
+             if (!problem.imagePaths.isEmpty()) {
+                val normalizedPaths = problem.imagePaths.mapIndexed { index, _ ->
+                     "${problem.id}_${index}.jpg"
+                }
+                backupProblem.withUpdatedImagePaths(normalizedPaths)
+            } else {
+                backupProblem
+            }
+        }.toMutableList()
+
+        val allSessions = repository.getAllSessionsSync()
+        val modifiedSessions = allSessions.filter {
+            (parseISO8601(it.updatedAt) ?: Instant.MIN).isAfter(lastSyncDate)
+        }.map { BackupClimbSession.fromClimbSession(it) }.toMutableList()
+
+        val allAttempts = repository.getAllAttemptsSync()
+        val modifiedAttempts = allAttempts.filter {
+            val updated = it.updatedAt
+            (parseISO8601(updated) ?: Instant.MIN).isAfter(lastSyncDate)
+        }.map { BackupAttempt.fromAttempt(it) }.toMutableList()
+
+        val deletedItems = repository.getDeletedItems().filter {
+            val deletedAt = parseISO8601(it.deletedAt) ?: Instant.MIN
+            deletedAt.isAfter(lastSyncDate)
+        }
+
+        for (item in deletedItems) {
+            when (item.type) {
+                "gym" -> modifiedGyms.add(BackupGym.createTombstone(item.id, item.deletedAt))
+                "problem" -> modifiedProblems.add(BackupProblem.createTombstone(item.id, item.deletedAt))
+                "session" -> modifiedSessions.add(BackupClimbSession.createTombstone(item.id, item.deletedAt))
+                "attempt" -> modifiedAttempts.add(BackupAttempt.createTombstone(item.id, item.deletedAt))
+            }
+        }
+
+        AppLogger.i(TAG) { "Delta Sync: Sending gyms=${modifiedGyms.size}, problems=${modifiedProblems.size}, sessions=${modifiedSessions.size}, attempts=${modifiedAttempts.size}" }
+
+        val deltaRequest = DeltaSyncRequest(
+            lastSyncTime = lastSyncTimeStr,
+            gyms = modifiedGyms,
+            problems = modifiedProblems,
+            sessions = modifiedSessions,
+            attempts = modifiedAttempts
+        )
+
+        val requestBody = json.encodeToString(DeltaSyncRequest.serializer(), deltaRequest)
+            .toRequestBody("application/json".toMediaType())
+
+        val request = Request.Builder()
+            .url("$serverUrl/sync/delta")
+            .header("Authorization", "Bearer $authToken")
+            .post(requestBody)
+            .build()
+
+        val response = withContext(Dispatchers.IO) {
+            httpClient.newCall(request).execute().use { response ->
+                if (!response.isSuccessful) {
+                    if (response.code == 401) throw SyncException.Unauthorized
+                    throw SyncException.ServerError(response.code)
+                }
+                val body = response.body?.string() ?: throw SyncException.InvalidResponse("Empty response")
+                json.decodeFromString<DeltaSyncResponse>(body)
+            }
+        }
+
+        if (response.requestFullSync) {
+            throw SyncException.General("Server requested full sync")
+        }
+
+        AppLogger.i(TAG) { "Delta Sync: Received gyms=${response.gyms.size}, problems=${response.problems.size}, sessions=${response.sessions.size}, attempts=${response.attempts.size}" }
+
+        applyDeltaResponse(response)
+        syncModifiedImages(modifiedProblems)
+
+        repository.clearDeletedItems()
+
+        sharedPreferences.edit()
+            .putString(Keys.LAST_SYNC_TIME, response.serverTime)
+            .apply()
+    }
+
+    private fun parseISO8601(dateStr: String?): Instant? {
+        if (dateStr == null) return null
+        return try {
+            Instant.parse(dateStr)
+        } catch (e: Exception) {
+            null
+        }
+    }
+
+    private suspend fun applyDeltaResponse(response: DeltaSyncResponse) {
+        val imagePathMapping = mutableMapOf<String, String>()
+        for (problem in response.problems) {
+            if (problem.isDeleted) continue
+
+            val paths = problem.imagePaths ?: continue
+            for ((index, path) in paths.withIndex()) {
+                val serverFilename = path.substringAfterLast('/')
+                try {
+                    val imageData = downloadImage(serverFilename)
+                    val localFilename = "${problem.id}_${index}.jpg"
+                    saveImageLocally(localFilename, imageData)
+                    imagePathMapping[serverFilename] = localFilename
+                } catch (e: Exception) {
+                    AppLogger.e(TAG, e) { "Failed to download image $serverFilename: ${e.message}" }
+                }
+            }
+        }
+
+        for (gym in response.gyms) {
+            if (gym.isDeleted) {
+                val serverUpdate = parseISO8601(gym.updatedAt) ?: Instant.MAX
+                val existing = repository.getGymById(gym.id)
+                if (existing != null) {
+                    val localUpdate = parseISO8601(existing.updatedAt) ?: Instant.MIN
+                    if (serverUpdate.isAfter(localUpdate) || serverUpdate == localUpdate) {
+                         repository.deleteGym(existing)
+                    }
+                }
+                continue
+            }
+
+            val existing = repository.getGymById(gym.id)
+            val serverUpdate = parseISO8601(gym.updatedAt) ?: Instant.MIN
+            if (existing != null) {
+                val localUpdate = parseISO8601(existing.updatedAt) ?: Instant.MIN
+                if (serverUpdate.isAfter(localUpdate)) {
+                    repository.updateGym(gym.toGym())
+                }
+            } else {
+                repository.insertGym(gym.toGym())
+            }
+        }
+
+        for (problem in response.problems) {
+            if (problem.isDeleted) {
+                val serverUpdate = parseISO8601(problem.updatedAt) ?: Instant.MAX
+                val existing = repository.getProblemById(problem.id)
+                if (existing != null) {
+                    val localUpdate = parseISO8601(existing.updatedAt) ?: Instant.MIN
+                    if (serverUpdate.isAfter(localUpdate) || serverUpdate == localUpdate) {
+                         repository.deleteProblem(existing)
+                    }
+                }
+                continue
+            }
+
+            var problemToMerge = problem
+            if (imagePathMapping.isNotEmpty() && !problem.imagePaths.isNullOrEmpty()) {
+                val updatedPaths = problem.imagePaths.map { imagePathMapping[it.substringAfterLast('/')] ?: it }
+                problemToMerge = problem.withUpdatedImagePaths(updatedPaths)
+            }
+
+            val existing = repository.getProblemById(problem.id)
+            val serverUpdate = parseISO8601(problem.updatedAt) ?: Instant.MIN
+            if (existing != null) {
+                val localUpdate = parseISO8601(existing.updatedAt) ?: Instant.MIN
+                if (serverUpdate.isAfter(localUpdate)) {
+                    repository.updateProblem(problemToMerge.toProblem())
+                }
+            } else {
+                repository.insertProblem(problemToMerge.toProblem())
+            }
+        }
+
+        for (session in response.sessions) {
+            if (session.isDeleted) {
+                val serverUpdate = parseISO8601(session.updatedAt) ?: Instant.MAX
+                val existing = repository.getSessionById(session.id)
+                if (existing != null) {
+                    val localUpdate = parseISO8601(existing.updatedAt) ?: Instant.MIN
+                    if (serverUpdate.isAfter(localUpdate) || serverUpdate == localUpdate) {
+                         repository.deleteSession(existing)
+                    }
+                }
+                continue
+            }
+
+            val existing = repository.getSessionById(session.id)
+            val serverUpdate = parseISO8601(session.updatedAt) ?: Instant.MIN
+            if (existing != null) {
+                val localUpdate = parseISO8601(existing.updatedAt) ?: Instant.MIN
+                if (serverUpdate.isAfter(localUpdate)) {
+                    repository.updateSession(session.toClimbSession())
+                }
+            } else {
+                repository.insertSession(session.toClimbSession())
+            }
+        }
+
+        for (attempt in response.attempts) {
+            if (attempt.isDeleted) {
+                val serverUpdate = parseISO8601(attempt.updatedAt ?: attempt.createdAt) ?: Instant.MAX
+                val existing = repository.getAttemptById(attempt.id)
+                if (existing != null) {
+                    val localUpdate = parseISO8601(existing.updatedAt) ?: Instant.MIN
+                    if (serverUpdate.isAfter(localUpdate) || serverUpdate == localUpdate) {
+                         repository.deleteAttempt(existing)
+                    }
+                }
+                continue
+            }
+
+            val existing = repository.getAttemptById(attempt.id)
+            val serverUpdate = parseISO8601(attempt.updatedAt ?: attempt.createdAt) ?: Instant.MIN
+            if (existing != null) {
+                val localUpdate = parseISO8601(existing.updatedAt) ?: Instant.MIN
+                if (serverUpdate.isAfter(localUpdate)) {
+                    repository.updateAttempt(attempt.toAttempt())
+                }
+            } else {
+                repository.insertAttempt(attempt.toAttempt())
+            }
+        }
+    }
+
+    private suspend fun syncModifiedImages(modifiedProblems: List<BackupProblem>) {
+         for (problem in modifiedProblems) {
+             if (problem.isDeleted) continue
+             val paths = problem.imagePaths ?: continue
+             for (path in paths) {
+                 val localFile = getLocalImageFile(path)
+                 if (localFile != null && localFile.exists()) {
+                     try {
+                         uploadImage(path, localFile.readBytes())
+                     } catch (e: Exception) {
+                         AppLogger.e(TAG, e) { "Failed to upload image $path: ${e.message}" }
+                     }
+                 }
+             }
+         }
+    }
+
+    private fun getLocalImageFile(filename: String): File? {
+        val dir = context.getExternalFilesDir("images") ?: return null
+        return File(dir, filename)
+    }
+
+    private fun saveImageLocally(filename: String, data: ByteArray) {
+        val dir = context.getExternalFilesDir("images") ?: return
+        if (!dir.exists()) dir.mkdirs()
+        File(dir, filename).writeBytes(data)
+    }
+
+    private suspend fun downloadData(): ClimbDataBackup {
+        val request = Request.Builder()
+            .url("$serverUrl/sync")
+            .header("Authorization", "Bearer $authToken")
+            .get()
+            .build()
+
+        return withContext(Dispatchers.IO) {
+            httpClient.newCall(request).execute().use { response ->
+                if (!response.isSuccessful) {
+                    if (response.code == 401) throw SyncException.Unauthorized
+                    throw SyncException.ServerError(response.code)
+                }
+                val body = response.body?.string() ?: throw SyncException.InvalidResponse("Empty body")
+                json.decodeFromString<ClimbDataBackup>(body)
+            }
+        }
+    }
+
+    private suspend fun uploadData(backup: ClimbDataBackup) {
+        val requestBody = json.encodeToString(backup).toRequestBody("application/json".toMediaType())
+        val request = Request.Builder()
+            .url("$serverUrl/sync")
+            .header("Authorization", "Bearer $authToken")
+            .put(requestBody)
+            .build()
+
+        withContext(Dispatchers.IO) {
+            httpClient.newCall(request).execute().use { response ->
+                if (!response.isSuccessful) {
+                    if (response.code == 401) throw SyncException.Unauthorized
+                    throw SyncException.ServerError(response.code)
+                }
+            }
+        }
+    }
+
+    private suspend fun syncImagesFromServer(backup: ClimbDataBackup): Map<String, String> {
+        val mapping = mutableMapOf<String, String>()
+        for (problem in backup.problems) {
+            if (problem.isDeleted) continue
+            val paths = problem.imagePaths ?: continue
+            for ((index, path) in paths.withIndex()) {
+                val serverFilename = path.substringAfterLast('/')
+                 try {
+                    val imageData = downloadImage(serverFilename)
+                    val localFilename = "${problem.id}_${index}.jpg"
+                    saveImageLocally(localFilename, imageData)
+                    mapping[serverFilename] = localFilename
+                } catch (e: Exception) {
+                    Log.e(TAG, "Failed to sync image $serverFilename", e)
+                }
+            }
+        }
+        return mapping
+    }
+
+    private suspend fun syncImagesToServer() {
+        val problems = repository.getAllProblemsSync()
+        for (problem in problems) {
+             for (path in problem.imagePaths) {
+                 val file = getLocalImageFile(path)
+                 if (file != null && file.exists()) {
+                      try {
+                          uploadImage(path, file.readBytes())
+                      } catch (e: Exception) {
+                           Log.e(TAG, "Failed to upload image $path", e)
+                      }
+                 }
+             }
+         }
+    }
+
+    private suspend fun downloadImage(filename: String): ByteArray {
+        val request = Request.Builder()
+            .url("$serverUrl/images/download?filename=$filename")
+            .header("Authorization", "Bearer $authToken")
+            .build()
+
+        return withContext(Dispatchers.IO) {
+            httpClient.newCall(request).execute().use { response ->
+                if (!response.isSuccessful) {
+                    if (response.code == 404) throw SyncException.ImageNotFound
+                    throw SyncException.ServerError(response.code)
+                }
+                response.body?.bytes() ?: throw SyncException.InvalidResponse("Empty image body")
+            }
+        }
+    }
+
+    private suspend fun uploadImage(filename: String, data: ByteArray) {
+        val requestBody = data.toRequestBody("application/octet-stream".toMediaType())
+        val request = Request.Builder()
+            .url("$serverUrl/images/upload?filename=$filename")
+            .header("Authorization", "Bearer $authToken")
+            .post(requestBody)
+            .build()
+
+        withContext(Dispatchers.IO) {
+            httpClient.newCall(request).execute().use { response ->
+                if (!response.isSuccessful) {
+                     throw SyncException.ServerError(response.code)
+                }
+            }
+        }
+    }
+
+    private suspend fun createBackupFromRepository(): ClimbDataBackup {
+        val gyms = repository.getAllGymsSync().map { BackupGym.fromGym(it) }
+        val problems = repository.getAllProblemsSync().map { BackupProblem.fromProblem(it) }
+        val sessions = repository.getAllSessionsSync().map { BackupClimbSession.fromClimbSession(it) }
+        val attempts = repository.getAllAttemptsSync().map { BackupAttempt.fromAttempt(it) }
+
+        return ClimbDataBackup(
+            exportedAt = DateFormatUtils.nowISO8601(),
+            gyms = gyms,
+            problems = problems,
+            sessions = sessions,
+            attempts = attempts
+        )
+    }
+
+    private suspend fun importBackupToRepository(backup: ClimbDataBackup, imagePathMapping: Map<String, String>) {
+        for (gym in backup.gyms) {
+            if (!gym.isDeleted) repository.insertGym(gym.toGym())
+        }
+
+        for (problem in backup.problems) {
+            if (!problem.isDeleted) {
+                var p = problem
+                if (imagePathMapping.isNotEmpty() && !problem.imagePaths.isNullOrEmpty()) {
+                    val updatedPaths = problem.imagePaths.map { imagePathMapping[it.substringAfterLast('/')] ?: it }
+                    p = problem.withUpdatedImagePaths(updatedPaths)
+                }
+                repository.insertProblem(p.toProblem())
+            }
+        }
+
+        for (session in backup.sessions) {
+            if (!session.isDeleted) repository.insertSession(session.toClimbSession())
+        }
+
+        for (attempt in backup.attempts) {
+            if (!attempt.isDeleted) repository.insertAttempt(attempt.toAttempt())
+        }
+    }
+
+    private suspend fun mergeDataSafely(local: ClimbDataBackup, server: ClimbDataBackup) {
+        val deltaResponse = DeltaSyncResponse(
+            serverTime = server.exportedAt,
+            gyms = server.gyms,
+            problems = server.problems,
+            sessions = server.sessions,
+            attempts = server.attempts,
+        )
+        applyDeltaResponse(deltaResponse)
+    }
+
+    override suspend fun testConnection() {
+        if (!isConfigured.value) throw SyncException.NotConfigured
+
+        val request = Request.Builder()
+            .url("$serverUrl/health")
+            .apply {
+                if (authToken.isNotBlank()) header("Authorization", "Bearer $authToken")
+            }
+            .head() // Using HEAD as originally, or GET
+            .build()
+
+        try {
+            withContext(Dispatchers.IO) {
+                httpClient.newCall(request).execute().use { response ->
+                    if (!response.isSuccessful && response.code != 405) {
+                         throw SyncException.ServerError(response.code)
+                    }
+                    _isConnected.value = true
+                    sharedPreferences.edit().putBoolean(Keys.IS_CONNECTED, true).apply()
+                }
+            }
+        } catch (e: Exception) {
+            _isConnected.value = false
+            throw e
+        }
+    }
+}

android/app/src/main/java/com/atridad/ascently/data/sync/DeltaSyncModels.kt

@@ -4,27 +4,25 @@ import com.atridad.ascently.data.format.BackupAttempt
 import com.atridad.ascently.data.format.BackupClimbSession
 import com.atridad.ascently.data.format.BackupGym
 import com.atridad.ascently.data.format.BackupProblem
-import com.atridad.ascently.data.format.DeletedItem
 import kotlinx.serialization.Serializable
 
 /** Request structure for delta sync - sends only changes since last sync */
 @Serializable
 data class DeltaSyncRequest(
-        val lastSyncTime: String,
-        val gyms: List<BackupGym>,
-        val problems: List<BackupProblem>,
-        val sessions: List<BackupClimbSession>,
-        val attempts: List<BackupAttempt>,
-        val deletedItems: List<DeletedItem>
+    val lastSyncTime: String,
+    val gyms: List<BackupGym>,
+    val problems: List<BackupProblem>,
+    val sessions: List<BackupClimbSession>,
+    val attempts: List<BackupAttempt>,
 )
 
 /** Response structure for delta sync - receives only changes from server */
 @Serializable
 data class DeltaSyncResponse(
-        val serverTime: String,
-        val gyms: List<BackupGym>,
-        val problems: List<BackupProblem>,
-        val sessions: List<BackupClimbSession>,
-        val attempts: List<BackupAttempt>,
-        val deletedItems: List<DeletedItem>
+    val serverTime: String,
+    val requestFullSync: Boolean = false,
+    val gyms: List<BackupGym>,
+    val problems: List<BackupProblem>,
+    val sessions: List<BackupClimbSession>,
+    val attempts: List<BackupAttempt>,
 )

android/app/src/main/java/com/atridad/ascently/data/sync/SyncException.kt

@@ -0,0 +1,23 @@
+package com.atridad.ascently.data.sync
+
+import java.io.IOException
+import java.io.Serializable
+
+sealed class SyncException(message: String) : IOException(message), Serializable {
+    object NotConfigured :
+        SyncException("Sync is not configured. Please set server URL and auth token.")
+
+    object NotConnected : SyncException("Not connected to server. Please test connection first.")
+
+    object Unauthorized : SyncException("Unauthorized. Please check your auth token.")
+
+    object ImageNotFound : SyncException("Image not found on server")
+
+    data class ServerError(val code: Int) : SyncException("Server error: HTTP $code")
+    data class InvalidResponse(val details: String) :
+        SyncException("Invalid server response: $details")
+
+    data class NetworkError(val details: String) : SyncException("Network error: $details")
+
+    data class General(val details: String) : SyncException(details)
+}

android/app/src/main/java/com/atridad/ascently/data/sync/SyncProvider.kt

@@ -0,0 +1,18 @@
+package com.atridad.ascently.data.sync
+
+import kotlinx.coroutines.flow.StateFlow
+
+interface SyncProvider {
+    val type: SyncProviderType
+    val isConfigured: StateFlow<Boolean>
+    val isConnected: StateFlow<Boolean>
+
+    suspend fun sync()
+    suspend fun testConnection()
+    fun disconnect()
+}
+
+enum class SyncProviderType {
+    NONE,
+    SERVER,
+}

android/app/src/main/java/com/atridad/ascently/data/sync/SyncService.kt

@@ -2,27 +2,10 @@ package com.atridad.ascently.data.sync
 
 import android.content.Context
 import android.content.SharedPreferences
-import android.net.ConnectivityManager
-import android.net.NetworkCapabilities
-import androidx.annotation.RequiresPermission
 import androidx.core.content.edit
-import com.atridad.ascently.data.format.BackupAttempt
-import com.atridad.ascently.utils.AppLogger
-import com.atridad.ascently.data.format.BackupClimbSession
-import com.atridad.ascently.data.format.BackupGym
-import com.atridad.ascently.data.format.BackupProblem
-import com.atridad.ascently.data.format.ClimbDataBackup
 import com.atridad.ascently.data.repository.ClimbRepository
 import com.atridad.ascently.data.state.DataStateManager
-import com.atridad.ascently.utils.DateFormatUtils
-import com.atridad.ascently.utils.ImageNamingUtils
-import com.atridad.ascently.utils.ImageUtils
-import java.io.IOException
-import java.io.Serializable
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
-import java.util.concurrent.TimeUnit
+import com.atridad.ascently.utils.AppLogger
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -31,43 +14,21 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import kotlinx.coroutines.withContext
-import kotlinx.serialization.json.Json
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.RequestBody.Companion.toRequestBody
 
 class SyncService(private val context: Context, private val repository: ClimbRepository) {
 
-    private val dataStateManager = DataStateManager(context)
-    private val syncMutex = Mutex()
     private val serviceScope = CoroutineScope(Dispatchers.IO + SupervisorJob())
+    private val syncMutex = Mutex()
 
     companion object {
         private const val TAG = "SyncService"
     }
 
-    private val sharedPreferences: SharedPreferences =
-        context.getSharedPreferences("sync_preferences", Context.MODE_PRIVATE)
-
-    private val httpClient =
-        OkHttpClient.Builder()
-            .connectTimeout(45, TimeUnit.SECONDS)
-            .readTimeout(90, TimeUnit.SECONDS)
-            .writeTimeout(90, TimeUnit.SECONDS)
-            .build()
-
-    private val json = Json {
-        prettyPrint = true
-        ignoreUnknownKeys = true
-        explicitNulls = false
-        coerceInputValues = true
-    }
+    // Currently we only support one provider, but this allows for future expansion
+    private val provider: SyncProvider = AscentlySyncProvider(context, repository, DataStateManager(context))
 
     // State
     private val _isSyncing = MutableStateFlow(false)
@@ -79,11 +40,9 @@ class SyncService(private val context: Context, private val repository: ClimbRep
     private val _syncError = MutableStateFlow<String?>(null)
     val syncError: StateFlow<String?> = _syncError.asStateFlow()
 
-    private val _isConnected = MutableStateFlow(false)
-    val isConnected: StateFlow<Boolean> = _isConnected.asStateFlow()
-
-    private val _isConfigured = MutableStateFlow(false)
-    val isConfiguredFlow: StateFlow<Boolean> = _isConfigured.asStateFlow()
+    // Delegate to provider
+    val isConnected: StateFlow<Boolean> = provider.isConnected
+    val isConfiguredFlow: StateFlow<Boolean> = provider.isConfigured
 
     private val _isTesting = MutableStateFlow(false)
     val isTesting: StateFlow<Boolean> = _isTesting.asStateFlow()
@@ -91,56 +50,40 @@ class SyncService(private val context: Context, private val repository: ClimbRep
     private val _isAutoSyncEnabled = MutableStateFlow(true)
     val isAutoSyncEnabled: StateFlow<Boolean> = _isAutoSyncEnabled.asStateFlow()
 
-    private var isOfflineMode = false
-
     // Debounced sync properties
     private var syncJob: Job? = null
     private var pendingChanges = false
     private val syncDebounceDelay = 2000L // 2 seconds
 
-    // Configuration keys
+    private val sharedPreferences: SharedPreferences =
+        context.getSharedPreferences("sync_preferences", Context.MODE_PRIVATE)
+
     private object Keys {
-        const val SERVER_URL = "server_url"
-        const val AUTH_TOKEN = "auth_token"
-        const val IS_CONNECTED = "is_connected"
         const val LAST_SYNC_TIME = "last_sync_time"
         const val AUTO_SYNC_ENABLED = "auto_sync_enabled"
-        const val OFFLINE_MODE = "offline_mode"
     }
 
     init {
         loadInitialState()
-        updateConfiguredState()
         repository.setAutoSyncCallback { serviceScope.launch { triggerAutoSync() } }
     }
 
     private fun loadInitialState() {
         _lastSyncTime.value = sharedPreferences.getString(Keys.LAST_SYNC_TIME, null)
-        _isConnected.value = sharedPreferences.getBoolean(Keys.IS_CONNECTED, false)
         _isAutoSyncEnabled.value = sharedPreferences.getBoolean(Keys.AUTO_SYNC_ENABLED, true)
-        isOfflineMode = sharedPreferences.getBoolean(Keys.OFFLINE_MODE, false)
-    }
-
-    private fun updateConfiguredState() {
-        _isConfigured.value = serverUrl.isNotBlank() && authToken.isNotBlank()
     }
 
+    // Proxy properties for Ascently provider configuration
     var serverUrl: String
-        get() = sharedPreferences.getString(Keys.SERVER_URL, "") ?: ""
+        get() = (provider as? AscentlySyncProvider)?.serverUrl ?: ""
         set(value) {
-            sharedPreferences.edit { putString(Keys.SERVER_URL, value) }
-            updateConfiguredState()
-            _isConnected.value = false
-            sharedPreferences.edit { putBoolean(Keys.IS_CONNECTED, false) }
+            (provider as? AscentlySyncProvider)?.serverUrl = value
         }
 
     var authToken: String
-        get() = sharedPreferences.getString(Keys.AUTH_TOKEN, "") ?: ""
+        get() = (provider as? AscentlySyncProvider)?.authToken ?: ""
         set(value) {
-            sharedPreferences.edit { putString(Keys.AUTH_TOKEN, value) }
-            updateConfiguredState()
-            _isConnected.value = false
-            sharedPreferences.edit { putBoolean(Keys.IS_CONNECTED, false) }
+            (provider as? AscentlySyncProvider)?.authToken = value
         }
 
     fun setAutoSyncEnabled(enabled: Boolean) {
@@ -148,93 +91,20 @@ class SyncService(private val context: Context, private val repository: ClimbRep
         sharedPreferences.edit { putBoolean(Keys.AUTO_SYNC_ENABLED, enabled) }
     }
 
-    @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE)
-    private fun isNetworkAvailable(): Boolean {
-        val connectivityManager =
-            context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-        val network = connectivityManager.activeNetwork ?: return false
-        val activeNetwork = connectivityManager.getNetworkCapabilities(network) ?: return false
-        return when {
-            activeNetwork.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> true
-            activeNetwork.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> true
-            else -> false
-        }
-    }
-
-    @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE)
     suspend fun syncWithServer() {
-        if (isOfflineMode) {
-            AppLogger.d(TAG) { "Sync skipped: Offline mode is enabled." }
-            return
-        }
-        if (!isNetworkAvailable()) {
-            _syncError.value = "No internet connection."
-            AppLogger.d(TAG) { "Sync skipped: No internet connection." }
-            return
-        }
-        if (!_isConfigured.value) {
+        if (!isConfiguredFlow.value) {
             throw SyncException.NotConfigured
         }
-        if (!_isConnected.value) {
-            throw SyncException.NotConnected
-        }
 
         syncMutex.withLock {
             _isSyncing.value = true
             _syncError.value = null
 
             try {
-                val localBackup = createBackupFromRepository()
-                val serverBackup = downloadData()
+                provider.sync()
 
-                val hasLocalData =
-                    localBackup.gyms.isNotEmpty() ||
-                            localBackup.problems.isNotEmpty() ||
-                            localBackup.sessions.isNotEmpty() ||
-                            localBackup.attempts.isNotEmpty()
-
-                val hasServerData =
-                    serverBackup.gyms.isNotEmpty() ||
-                            serverBackup.problems.isNotEmpty() ||
-                            serverBackup.sessions.isNotEmpty() ||
-                            serverBackup.attempts.isNotEmpty()
-
-                // If both client and server have been synced before, use delta sync
-                val lastSyncTimeStr = sharedPreferences.getString(Keys.LAST_SYNC_TIME, null)
-                if (hasLocalData && hasServerData && lastSyncTimeStr != null) {
-                    AppLogger.d(TAG) { "Using delta sync for incremental updates" }
-                    performDeltaSync(lastSyncTimeStr)
-                } else {
-                    when {
-                        !hasLocalData && hasServerData -> {
-                            AppLogger.d(TAG) { "No local data found, performing full restore from server" }
-                            val imagePathMapping = syncImagesFromServer(serverBackup)
-                            importBackupToRepository(serverBackup, imagePathMapping)
-                            AppLogger.d(TAG) { "Full restore completed" }
-                        }
-
-                        hasLocalData && !hasServerData -> {
-                            AppLogger.d(TAG) { "No server data found, uploading local data to server" }
-                            uploadData(localBackup)
-                            syncImagesForBackup(localBackup)
-                            AppLogger.d(TAG) { "Initial upload completed" }
-                        }
-
-                        hasLocalData && hasServerData -> {
-                            AppLogger.d(TAG) { "Both local and server data exist, merging (server wins)" }
-                            mergeDataSafely(serverBackup)
-                            AppLogger.d(TAG) { "Merge completed" }
-                        }
-
-                        else -> {
-                            AppLogger.d(TAG) { "No data to sync" }
-                        }
-                    }
-                }
-
-                val now = DateFormatUtils.nowISO8601()
-                _lastSyncTime.value = now
-                sharedPreferences.edit { putString(Keys.LAST_SYNC_TIME, now) }
+                // Update last sync time from shared prefs (provider updates it)
+                _lastSyncTime.value = sharedPreferences.getString(Keys.LAST_SYNC_TIME, null)
             } catch (e: Exception) {
                 _syncError.value = e.message
                 throw e
@@ -244,550 +114,21 @@ class SyncService(private val context: Context, private val repository: ClimbRep
         }
     }
 
-    private suspend fun performDeltaSync(lastSyncTimeStr: String) {
-        AppLogger.d(TAG) { "Starting delta sync with lastSyncTime=$lastSyncTimeStr" }
-
-        // Parse last sync time to filter modified items
-        val lastSyncDate = parseISO8601(lastSyncTimeStr) ?: Date(0)
-
-        // Collect items modified since last sync
-        val allGyms = repository.getAllGyms().first()
-        val modifiedGyms =
-            allGyms
-                .filter { gym -> parseISO8601(gym.updatedAt)?.after(lastSyncDate) == true }
-                .map { BackupGym.fromGym(it) }
-
-        val allProblems = repository.getAllProblems().first()
-        val modifiedProblems =
-            allProblems
-                .filter { problem ->
-                    parseISO8601(problem.updatedAt)?.after(lastSyncDate) == true
-                }
-                .map { problem ->
-                    val backupProblem = BackupProblem.fromProblem(problem)
-                    val normalizedImagePaths =
-                        problem.imagePaths.mapIndexed { index, _ ->
-                            ImageNamingUtils.generateImageFilename(problem.id, index)
-                        }
-                    if (normalizedImagePaths.isNotEmpty()) {
-                        backupProblem.copy(imagePaths = normalizedImagePaths)
-                    } else {
-                        backupProblem
-                    }
-                }
-
-        val allSessions = repository.getAllSessions().first()
-        val modifiedSessions =
-            allSessions
-                .filter { session ->
-                    parseISO8601(session.updatedAt)?.after(lastSyncDate) == true
-                }
-                .map { BackupClimbSession.fromClimbSession(it) }
-
-        val allAttempts = repository.getAllAttempts().first()
-        val modifiedAttempts =
-            allAttempts
-                .filter { attempt ->
-                    parseISO8601(attempt.createdAt)?.after(lastSyncDate) == true
-                }
-                .map { BackupAttempt.fromAttempt(it) }
-
-        val allDeletions = repository.getDeletedItems()
-        val modifiedDeletions =
-            allDeletions.filter { item ->
-                parseISO8601(item.deletedAt)?.after(lastSyncDate) == true
-            }
-
-        AppLogger.d(TAG) {
-            "Delta sync sending: gyms=${modifiedGyms.size}, problems=${modifiedProblems.size}, sessions=${modifiedSessions.size}, attempts=${modifiedAttempts.size}, deletions=${modifiedDeletions.size}"
-        }
-
-        // Create delta request
-        val deltaRequest =
-            DeltaSyncRequest(
-                lastSyncTime = lastSyncTimeStr,
-                gyms = modifiedGyms,
-                problems = modifiedProblems,
-                sessions = modifiedSessions,
-                attempts = modifiedAttempts,
-                deletedItems = modifiedDeletions
-            )
-
-        val requestBody =
-            json.encodeToString(DeltaSyncRequest.serializer(), deltaRequest)
-                .toRequestBody("application/json".toMediaType())
-
-        val request =
-            Request.Builder()
-                .url("$serverUrl/sync/delta")
-                .header("Authorization", "Bearer $authToken")
-                .post(requestBody)
-                .build()
-
-        val deltaResponse =
-            withContext(Dispatchers.IO) {
-                try {
-                    httpClient.newCall(request).execute().use { response ->
-                        if (response.isSuccessful) {
-                            val body = response.body?.string()
-                            if (!body.isNullOrEmpty()) {
-                                json.decodeFromString(DeltaSyncResponse.serializer(), body)
-                            } else {
-                                throw SyncException.InvalidResponse("Empty response body")
-                            }
-                        } else {
-                            handleHttpError(response.code)
-                        }
-                    }
-                } catch (e: IOException) {
-                    throw SyncException.NetworkError(e.message ?: "Network error")
-                }
-            }
-
-        AppLogger.d(TAG) {
-            "Delta sync received: gyms=${deltaResponse.gyms.size}, problems=${deltaResponse.problems.size}, sessions=${deltaResponse.sessions.size}, attempts=${deltaResponse.attempts.size}, deletions=${deltaResponse.deletedItems.size}"
-        }
-
-        // Apply server changes to local data
-        applyDeltaResponse(deltaResponse)
-
-        // Sync only modified problem images
-        syncModifiedImages(modifiedProblems)
-    }
-
-    private fun parseISO8601(dateString: String): Date? {
-        return try {
-            val format = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.US)
-            format.parse(dateString)
-        } catch (e: Exception) {
-            null
-        }
-    }
-
-    private suspend fun applyDeltaResponse(response: DeltaSyncResponse) {
-        // Temporarily disable auto-sync to prevent recursive sync triggers
-        repository.setAutoSyncCallback(null)
-
-        try {
-            // Merge and apply deletions first to prevent resurrection
-            val allDeletions = repository.getDeletedItems() + response.deletedItems
-            val uniqueDeletions = allDeletions.distinctBy { "${it.type}:${it.id}" }
-
-            AppLogger.d(TAG) { "Applying ${uniqueDeletions.size} deletion records before merging data" }
-            applyDeletions(uniqueDeletions)
-
-            // Build deleted item lookup set
-            val deletedItemSet = uniqueDeletions.map { "${it.type}:${it.id}" }.toSet()
-
-            // Download images for new/modified problems from server
-            val imagePathMapping = mutableMapOf<String, String>()
-            for (problem in response.problems) {
-                if (deletedItemSet.contains("problem:${problem.id}")) {
-                    continue
-                }
-                problem.imagePaths?.forEach { imagePath ->
-                    val serverFilename = imagePath.substringAfterLast('/')
-                    try {
-                        val localImagePath = downloadImage(serverFilename)
-                        if (localImagePath != null) {
-                            imagePathMapping[imagePath] = localImagePath
-                        }
-                    } catch (e: Exception) {
-                        AppLogger.w(TAG) { "Failed to download image $imagePath: ${e.message}" }
-                    }
-                }
-            }
-
-            // Merge gyms
-            val existingGyms = repository.getAllGyms().first()
-            for (backupGym in response.gyms) {
-                if (deletedItemSet.contains("gym:${backupGym.id}")) {
-                    continue
-                }
-                val existing = existingGyms.find { it.id == backupGym.id }
-                if (existing == null || backupGym.updatedAt >= existing.updatedAt) {
-                    val gym = backupGym.toGym()
-                    if (existing != null) {
-                        repository.updateGym(gym)
-                    } else {
-                        repository.insertGym(gym)
-                    }
-                }
-            }
-
-            // Merge problems
-            val existingProblems = repository.getAllProblems().first()
-            for (backupProblem in response.problems) {
-                if (deletedItemSet.contains("problem:${backupProblem.id}")) {
-                    continue
-                }
-                val updatedImagePaths =
-                    backupProblem.imagePaths?.map { oldPath ->
-                        imagePathMapping[oldPath] ?: oldPath
-                    }
-                val problemToMerge = backupProblem.copy(imagePaths = updatedImagePaths)
-                val problem = problemToMerge.toProblem()
-
-                val existing = existingProblems.find { it.id == backupProblem.id }
-                if (existing == null || backupProblem.updatedAt >= existing.updatedAt) {
-                    if (existing != null) {
-                        repository.updateProblem(problem)
-                    } else {
-                        repository.insertProblem(problem)
-                    }
-                }
-            }
-
-            // Merge sessions
-            val existingSessions = repository.getAllSessions().first()
-            for (backupSession in response.sessions) {
-                if (deletedItemSet.contains("session:${backupSession.id}")) {
-                    continue
-                }
-                val session = backupSession.toClimbSession()
-                val existing = existingSessions.find { it.id == backupSession.id }
-                if (existing == null || backupSession.updatedAt >= existing.updatedAt) {
-                    if (existing != null) {
-                        repository.updateSession(session)
-                    } else {
-                        repository.insertSession(session)
-                    }
-                }
-            }
-
-            // Merge attempts
-            val existingAttempts = repository.getAllAttempts().first()
-            for (backupAttempt in response.attempts) {
-                if (deletedItemSet.contains("attempt:${backupAttempt.id}")) {
-                    continue
-                }
-                val attempt = backupAttempt.toAttempt()
-                val existing = existingAttempts.find { it.id == backupAttempt.id }
-                if (existing == null || backupAttempt.createdAt >= existing.createdAt) {
-                    if (existing != null) {
-                        repository.updateAttempt(attempt)
-                    } else {
-                        repository.insertAttempt(attempt)
-                    }
-                }
-            }
-
-            // Apply deletions again for safety
-            applyDeletions(uniqueDeletions)
-
-            // Update deletion records
-            repository.clearDeletedItems()
-            uniqueDeletions.forEach { repository.trackDeletion(it.id, it.type) }
-        } finally {
-            // Re-enable auto-sync
-            repository.setAutoSyncCallback { serviceScope.launch { triggerAutoSync() } }
-        }
-    }
-
-    private suspend fun applyDeletions(
-        deletions: List<com.atridad.ascently.data.format.DeletedItem>
-    ) {
-        val existingGyms = repository.getAllGyms().first()
-        val existingProblems = repository.getAllProblems().first()
-        val existingSessions = repository.getAllSessions().first()
-        val existingAttempts = repository.getAllAttempts().first()
-
-        for (item in deletions) {
-            when (item.type) {
-                "gym" -> {
-                    existingGyms.find { it.id == item.id }?.let { repository.deleteGym(it) }
-                }
-
-                "problem" -> {
-                    existingProblems.find { it.id == item.id }?.let { repository.deleteProblem(it) }
-                }
-
-                "session" -> {
-                    existingSessions.find { it.id == item.id }?.let { repository.deleteSession(it) }
-                }
-
-                "attempt" -> {
-                    existingAttempts.find { it.id == item.id }?.let { repository.deleteAttempt(it) }
-                }
-            }
-        }
-    }
-
-    private suspend fun syncModifiedImages(modifiedProblems: List<BackupProblem>) {
-        if (modifiedProblems.isEmpty()) return
-
-        AppLogger.d(TAG) { "Syncing images for ${modifiedProblems.size} modified problems" }
-
-        for (backupProblem in modifiedProblems) {
-            backupProblem.imagePaths?.forEach { imagePath ->
-                val filename = imagePath.substringAfterLast('/')
-                uploadImage(imagePath, filename)
-            }
-        }
-    }
-
-    private suspend fun downloadData(): ClimbDataBackup {
-        val request =
-            Request.Builder()
-                .url("$serverUrl/sync")
-                .header("Authorization", "Bearer $authToken")
-                .get()
-                .build()
-
-        return withContext(Dispatchers.IO) {
-            try {
-                httpClient.newCall(request).execute().use { response ->
-                    if (response.isSuccessful) {
-                        val body = response.body?.string()
-                        if (!body.isNullOrEmpty()) {
-                            json.decodeFromString(body)
-                        } else {
-                            ClimbDataBackup(
-                                exportedAt = DateFormatUtils.nowISO8601(),
-                                gyms = emptyList(),
-                                problems = emptyList(),
-                                sessions = emptyList(),
-                                attempts = emptyList()
-                            )
-                        }
-                    } else {
-                        handleHttpError(response.code)
-                    }
-                }
-            } catch (e: IOException) {
-                throw SyncException.NetworkError(e.message ?: "Network error")
-            }
-        }
-    }
-
-    private suspend fun uploadData(backup: ClimbDataBackup) {
-        val requestBody =
-            json.encodeToString(backup).toRequestBody("application/json".toMediaType())
-
-        val request =
-            Request.Builder()
-                .url("$serverUrl/sync")
-                .header("Authorization", "Bearer $authToken")
-                .put(requestBody)
-                .build()
-
-        withContext(Dispatchers.IO) {
-            try {
-                httpClient.newCall(request).execute().use { response ->
-                    if (!response.isSuccessful) {
-                        handleHttpError(response.code)
-                    }
-                }
-            } catch (e: IOException) {
-                throw SyncException.NetworkError(e.message ?: "Network error")
-            }
-        }
-    }
-
-    private suspend fun syncImagesFromServer(backup: ClimbDataBackup): Map<String, String> {
-        val imagePathMapping = mutableMapOf<String, String>()
-        val totalImages = backup.problems.sumOf { it.imagePaths?.size ?: 0 }
-        AppLogger.d(TAG) { "Starting image download from server for $totalImages images" }
-
-        withContext(Dispatchers.IO) {
-            backup.problems.forEach { problem ->
-                problem.imagePaths?.forEach { imagePath ->
-                    val serverFilename = imagePath.substringAfterLast('/')
-                    try {
-                        val localImagePath = downloadImage(serverFilename)
-                        if (localImagePath != null) {
-                            imagePathMapping[imagePath] = localImagePath
-                        }
-                    } catch (_: SyncException.ImageNotFound) {
-                        AppLogger.w(TAG) { "Image not found on server: $imagePath" }
-                    } catch (e: Exception) {
-                        AppLogger.w(TAG) { "Failed to download image $imagePath: ${e.message}" }
-                    }
-                }
-            }
-        }
-        return imagePathMapping
-    }
-
-    private suspend fun downloadImage(serverFilename: String): String? {
-        val request =
-            Request.Builder()
-                .url("$serverUrl/images/download?filename=$serverFilename")
-                .header("Authorization", "Bearer $authToken")
-                .build()
-
-        return withContext(Dispatchers.IO) {
-            try {
-                httpClient.newCall(request).execute().use { response ->
-                    if (response.isSuccessful) {
-                        response.body?.bytes()?.let {
-                            ImageUtils.saveImageFromBytesWithFilename(context, it, serverFilename)
-                        }
-                    } else {
-                        if (response.code == 404) throw SyncException.ImageNotFound
-                        null
-                    }
-                }
-            } catch (e: IOException) {
-                AppLogger.e(TAG, e) { "Network error downloading image $serverFilename" }
-                null
-            }
-        }
-    }
-
-    private suspend fun syncImagesForBackup(backup: ClimbDataBackup) {
-        AppLogger.d(TAG) { "Starting image sync for backup with ${backup.problems.size} problems" }
-        withContext(Dispatchers.IO) {
-            backup.problems.forEach { problem ->
-                problem.imagePaths?.forEach { localPath ->
-                    val filename = localPath.substringAfterLast('/')
-                    uploadImage(localPath, filename)
-                }
-            }
-        }
-    }
-
-    private suspend fun uploadImage(localPath: String, filename: String) {
-        val file = ImageUtils.getImageFile(context, localPath)
-        if (!file.exists()) {
-            AppLogger.w(TAG) { "Local image file not found, cannot upload: $localPath" }
-            return
-        }
-
-        val requestBody = file.readBytes().toRequestBody("application/octet-stream".toMediaType())
-
-        val request =
-            Request.Builder()
-                .url("$serverUrl/images/upload?filename=$filename")
-                .header("Authorization", "Bearer $authToken")
-                .post(requestBody)
-                .build()
-
-        withContext(Dispatchers.IO) {
-            try {
-                httpClient.newCall(request).execute().use { response ->
-                    if (response.isSuccessful) {
-                        AppLogger.d(TAG) { "Successfully uploaded image: $filename" }
-                    } else {
-                        AppLogger.w(TAG) {
-                            "Failed to upload image $filename. Server responded with ${response.code}"
-                        }
-                    }
-                }
-            } catch (e: IOException) {
-                AppLogger.e(TAG, e) { "Network error uploading image $filename" }
-            }
-        }
-    }
-
-    private suspend fun createBackupFromRepository(): ClimbDataBackup {
-        return withContext(Dispatchers.Default) {
-            ClimbDataBackup(
-                exportedAt = dataStateManager.getLastModified(),
-                gyms = repository.getAllGyms().first().map { BackupGym.fromGym(it) },
-                problems =
-                    repository.getAllProblems().first().map { problem ->
-                        val backupProblem = BackupProblem.fromProblem(problem)
-                        val normalizedImagePaths =
-                            problem.imagePaths.mapIndexed { index, _ ->
-                                ImageNamingUtils.generateImageFilename(
-                                    problem.id,
-                                    index
-                                )
-                            }
-                        if (normalizedImagePaths.isNotEmpty()) {
-                            backupProblem.copy(imagePaths = normalizedImagePaths)
-                        } else {
-                            backupProblem
-                        }
-                    },
-                sessions =
-                    repository.getAllSessions().first().map {
-                        BackupClimbSession.fromClimbSession(it)
-                    },
-                attempts =
-                    repository.getAllAttempts().first().map {
-                        BackupAttempt.fromAttempt(it)
-                    },
-                deletedItems = repository.getDeletedItems()
-            )
-        }
-    }
-
-    private suspend fun importBackupToRepository(
-        backup: ClimbDataBackup,
-        imagePathMapping: Map<String, String>
-    ) {
-        val gyms = backup.gyms.map { it.toGym() }
-        val problems =
-            backup.problems.map { backupProblem ->
-                val imagePaths = backupProblem.imagePaths
-                val updatedImagePaths =
-                    imagePaths?.map { oldPath -> imagePathMapping[oldPath] ?: oldPath }
-                backupProblem.copy(imagePaths = updatedImagePaths).toProblem()
-            }
-        val sessions = backup.sessions.map { it.toClimbSession() }
-        val attempts = backup.attempts.map { it.toAttempt() }
-
-        repository.resetAllData()
-
-        gyms.forEach { repository.insertGymWithoutSync(it) }
-        problems.forEach { repository.insertProblemWithoutSync(it) }
-        sessions.forEach { repository.insertSessionWithoutSync(it) }
-        attempts.forEach { repository.insertAttemptWithoutSync(it) }
-
-        repository.clearDeletedItems()
-    }
-
-    private suspend fun mergeDataSafely(serverBackup: ClimbDataBackup) {
-        AppLogger.d(TAG) { "Server data will overwrite local data. Performing full restore." }
-        val imagePathMapping = syncImagesFromServer(serverBackup)
-        importBackupToRepository(serverBackup, imagePathMapping)
-    }
-
-    private fun handleHttpError(code: Int): Nothing {
-        when (code) {
-            401 -> throw SyncException.Unauthorized
-            in 500..599 -> throw SyncException.ServerError(code)
-            else -> throw SyncException.InvalidResponse("HTTP error code: $code")
-        }
-    }
-
     suspend fun testConnection() {
-        if (!_isConfigured.value) {
-            _isConnected.value = false
-            _syncError.value = "Server URL or Auth Token is not set."
-            return
-        }
         _isTesting.value = true
         _syncError.value = null
-
-        val request =
-            Request.Builder()
-                .url("$serverUrl/sync")
-                .header("Authorization", "Bearer $authToken")
-                .head()
-                .build()
         try {
-            withContext(Dispatchers.IO) {
-                httpClient.newCall(request).execute().use { response ->
-                    _isConnected.value = response.isSuccessful || response.code == 405
-                }
-            }
-            if (!_isConnected.value) {
-                _syncError.value = "Connection failed. Check URL and token."
-            }
+            provider.testConnection()
         } catch (e: Exception) {
-            _isConnected.value = false
             _syncError.value = "Connection error: ${e.message}"
+            throw e
         } finally {
-            sharedPreferences.edit { putBoolean(Keys.IS_CONNECTED, _isConnected.value) }
             _isTesting.value = false
         }
     }
 
     fun triggerAutoSync() {
-        if (!_isConfigured.value || !_isConnected.value || !_isAutoSyncEnabled.value) {
+        if (!isConfiguredFlow.value || !isConnected.value || !_isAutoSyncEnabled.value) {
             return
         }
         if (_isSyncing.value) {
@@ -812,30 +153,9 @@ class SyncService(private val context: Context, private val repository: ClimbRep
 
     fun clearConfiguration() {
         syncJob?.cancel()
-        serverUrl = ""
-        authToken = ""
+        provider.disconnect()
         setAutoSyncEnabled(true)
         _lastSyncTime.value = null
-        _isConnected.value = false
         _syncError.value = null
-        sharedPreferences.edit { clear() }
-        updateConfiguredState()
     }
 }
-
-sealed class SyncException(message: String) : IOException(message), Serializable {
-    object NotConfigured :
-        SyncException("Sync is not configured. Please set server URL and auth token.")
-
-    object NotConnected : SyncException("Not connected to server. Please test connection first.")
-
-    object Unauthorized : SyncException("Unauthorized. Please check your auth token.")
-
-    object ImageNotFound : SyncException("Image not found on server")
-
-    data class ServerError(val code: Int) : SyncException("Server error: HTTP $code")
-    data class InvalidResponse(val details: String) :
-        SyncException("Invalid server response: $details")
-
-    data class NetworkError(val details: String) : SyncException("Network error: $details")
-}

android/app/src/main/java/com/atridad/ascently/navigation/BottomNavigationItem.kt

@@ -7,30 +7,30 @@ import androidx.compose.ui.graphics.vector.ImageVector
 data class BottomNavigationItem(val screen: Screen, val icon: ImageVector, val label: String)
 
 val bottomNavigationItems =
-        listOf(
-                BottomNavigationItem(
-                        screen = Screen.Sessions,
-                        icon = Icons.Default.PlayArrow,
-                        label = "Sessions"
-                ),
-                BottomNavigationItem(
-                        screen = Screen.Problems,
-                        icon = Icons.Default.Star,
-                        label = "Problems"
-                ),
-                BottomNavigationItem(
-                        screen = Screen.Analytics,
-                        icon = Icons.Default.Info,
-                        label = "Analytics"
-                ),
-                BottomNavigationItem(
-                        screen = Screen.Gyms,
-                        icon = Icons.Default.LocationOn,
-                        label = "Gyms"
-                ),
-                BottomNavigationItem(
-                        screen = Screen.Settings,
-                        icon = Icons.Default.Settings,
-                        label = "Settings"
-                )
-        )
+    listOf(
+        BottomNavigationItem(
+            screen = Screen.Sessions,
+            icon = Icons.Default.PlayArrow,
+            label = "Sessions",
+        ),
+        BottomNavigationItem(
+            screen = Screen.Problems,
+            icon = Icons.Default.Star,
+            label = "Problems",
+        ),
+        BottomNavigationItem(
+            screen = Screen.Analytics,
+            icon = Icons.Default.Info,
+            label = "Analytics",
+        ),
+        BottomNavigationItem(
+            screen = Screen.Gyms,
+            icon = Icons.Default.LocationOn,
+            label = "Gyms",
+        ),
+        BottomNavigationItem(
+            screen = Screen.Settings,
+            icon = Icons.Default.Settings,
+            label = "Settings",
+        ),
+    )

android/app/src/main/java/com/atridad/ascently/service/SessionTrackingService.kt

@@ -15,13 +15,14 @@ import com.atridad.ascently.R
 import com.atridad.ascently.data.database.AscentlyDatabase
 import com.atridad.ascently.data.repository.ClimbRepository
 import com.atridad.ascently.utils.AppLogger
+import com.atridad.ascently.utils.DateFormatUtils
 import com.atridad.ascently.widget.ClimbStatsWidgetProvider
-import java.time.LocalDateTime
-import java.time.ZoneId
-import java.time.temporal.ChronoUnit
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.runBlocking
+import java.time.LocalDateTime
+import java.time.ZoneId
+import java.time.temporal.ChronoUnit
 
 class SessionTrackingService : Service() {
 
@@ -224,12 +225,12 @@ class SessionTrackingService : Service() {
                     .addAction(
                         R.drawable.ic_mountains,
                         "Open Session",
-                        createOpenAppIntent()
+                        createOpenAppIntent(),
                     )
                     .addAction(
                         android.R.drawable.ic_menu_close_clear_cancel,
                         "End Session",
-                        createStopPendingIntent(sessionId)
+                        createStopPendingIntent(sessionId),
                     )
 
             // Use Live Update
@@ -237,9 +238,8 @@ class SessionTrackingService : Service() {
                 val startTimeMillis =
                     session.startTime?.let { startTime ->
                         try {
-                            val start = LocalDateTime.parse(startTime)
-                            val zoneId = ZoneId.systemDefault()
-                            start.atZone(zoneId).toInstant().toEpochMilli()
+                            DateFormatUtils.parseISO8601(startTime)?.toEpochMilli()
+                                ?: System.currentTimeMillis()
                         } catch (_: Exception) {
                             System.currentTimeMillis()
                         }
@@ -249,7 +249,7 @@ class SessionTrackingService : Service() {
                 notificationBuilder
                     .setContentTitle("Climbing Session Active")
                     .setContentText(
-                        "${gym?.name ?: "Gym"} • ${attempts.size} attempts"
+                        "${gym?.name ?: "Gym"} • ${attempts.size} attempts",
                     )
                     .setWhen(startTimeMillis)
                     .setUsesChronometer(true)
@@ -263,9 +263,9 @@ class SessionTrackingService : Service() {
                 val duration =
                     session.startTime?.let { startTime ->
                         try {
-                            val start = LocalDateTime.parse(startTime)
-                            val now = LocalDateTime.now()
-                            val totalSeconds = ChronoUnit.SECONDS.between(start, now)
+                            val start = DateFormatUtils.parseISO8601(startTime)
+                            val now = java.time.Instant.now()
+                            val totalSeconds = if (start != null) ChronoUnit.SECONDS.between(start, now) else 0L
                             val hours = totalSeconds / 3600
                             val minutes = (totalSeconds % 3600) / 60
                             val seconds = totalSeconds % 60
@@ -284,7 +284,7 @@ class SessionTrackingService : Service() {
                 notificationBuilder
                     .setContentTitle("Climbing Session Active")
                     .setContentText(
-                        "${gym?.name ?: "Gym"} • $duration • ${attempts.size} attempts"
+                        "${gym?.name ?: "Gym"} • $duration • ${attempts.size} attempts",
                     )
             }
 
@@ -309,7 +309,7 @@ class SessionTrackingService : Service() {
             this,
             0,
             intent,
-            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE,
         )
     }
 
@@ -319,7 +319,7 @@ class SessionTrackingService : Service() {
             this,
             1,
             intent,
-            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE,
         )
     }
 
@@ -328,7 +328,7 @@ class SessionTrackingService : Service() {
             NotificationChannel(
                 CHANNEL_ID,
                 "Session Tracking",
-                NotificationManager.IMPORTANCE_DEFAULT
+                NotificationManager.IMPORTANCE_DEFAULT,
             )
                 .apply {
                     description = "Shows active climbing session information"

android/app/src/main/java/com/atridad/ascently/ui/AscentlyApp.kt

@@ -35,7 +35,7 @@ import com.atridad.ascently.utils.NotificationPermissionUtils
 fun AscentlyApp(
     shortcutAction: String? = null,
     lastUsedGymId: String? = null,
-    onShortcutActionProcessed: () -> Unit = {}
+    onShortcutActionProcessed: () -> Unit = {},
 ) {
     val navController = rememberNavController()
     val context = LocalContext.current
@@ -53,7 +53,7 @@ fun AscentlyApp(
 
     val permissionLauncher =
         rememberLauncherForActivityResult(
-            contract = ActivityResultContracts.RequestPermission()
+            contract = ActivityResultContracts.RequestPermission(),
         ) { isGranted: Boolean ->
             if (!isGranted) {
                 showNotificationPermissionDialog = false
@@ -90,7 +90,7 @@ fun AscentlyApp(
             context = context,
             hasActiveSession = activeSession != null,
             hasGyms = gyms.isNotEmpty(),
-            lastUsedGym = if (activeSession == null && gyms.size > 1) lastUsedGym else null
+            lastUsedGym = if (activeSession == null && gyms.size > 1) lastUsedGym else null,
         )
     }
 
@@ -121,7 +121,7 @@ fun AscentlyApp(
             if (activeSession == null) {
                 if (NotificationPermissionUtils.shouldRequestNotificationPermission() &&
                     !NotificationPermissionUtils.isNotificationPermissionGranted(
-                        context
+                        context,
                     )
                 ) {
                     AppLogger.d("AscentlyApp") { "Showing notification permission dialog" }
@@ -160,20 +160,20 @@ fun AscentlyApp(
             fabConfig?.let { config ->
                 FloatingActionButton(
                     onClick = config.onClick,
-                    containerColor = MaterialTheme.colorScheme.primary
+                    containerColor = MaterialTheme.colorScheme.primary,
                 ) {
                     Icon(
                         imageVector = config.icon,
-                        contentDescription = config.contentDescription
+                        contentDescription = config.contentDescription,
                     )
                 }
             }
-        }
+        },
     ) { innerPadding ->
         NavHost(
             navController = navController,
             startDestination = Screen.Sessions,
-            modifier = Modifier.padding(innerPadding)
+            modifier = Modifier.padding(innerPadding),
         ) {
             composable<Screen.Sessions> {
                 LaunchedEffect(gyms, activeSession) {
@@ -187,14 +187,14 @@ fun AscentlyApp(
                                             .shouldRequestNotificationPermission() &&
                                         !NotificationPermissionUtils
                                             .isNotificationPermissionGranted(
-                                                context
+                                                context,
                                             )
                                     ) {
                                         showNotificationPermissionDialog = true
                                     } else {
                                         navController.navigate(Screen.AddEditSession())
                                     }
-                                }
+                                },
                             )
                         } else {
                             null
@@ -204,7 +204,7 @@ fun AscentlyApp(
                     viewModel = viewModel,
                     onNavigateToSessionDetail = { sessionId ->
                         navController.navigate(Screen.SessionDetail(sessionId))
-                    }
+                    },
                 )
             }
 
@@ -217,7 +217,7 @@ fun AscentlyApp(
                                 contentDescription = "Add Problem",
                                 onClick = {
                                     navController.navigate(Screen.AddEditProblem())
-                                }
+                                },
                             )
                         } else {
                             null
@@ -227,7 +227,7 @@ fun AscentlyApp(
                     viewModel = viewModel,
                     onNavigateToProblemDetail = { problemId ->
                         navController.navigate(Screen.ProblemDetail(problemId))
-                    }
+                    },
                 )
             }
 
@@ -242,14 +242,14 @@ fun AscentlyApp(
                         FabConfig(
                             icon = Icons.Default.Add,
                             contentDescription = "Add Gym",
-                            onClick = { navController.navigate(Screen.AddEditGym()) }
+                            onClick = { navController.navigate(Screen.AddEditGym()) },
                         )
                 }
                 GymsScreen(
                     viewModel = viewModel,
                     onNavigateToGymDetail = { gymId ->
                         navController.navigate(Screen.GymDetail(gymId))
-                    }
+                    },
                 )
             }
 
@@ -267,7 +267,7 @@ fun AscentlyApp(
                     onNavigateBack = { navController.popBackStack() },
                     onNavigateToProblemDetail = { problemId ->
                         navController.navigate(Screen.ProblemDetail(problemId))
-                    }
+                    },
                 )
             }
 
@@ -280,7 +280,7 @@ fun AscentlyApp(
                     onNavigateBack = { navController.popBackStack() },
                     onNavigateToEdit = { problemId ->
                         navController.navigate(Screen.AddEditProblem(problemId = problemId))
-                    }
+                    },
                 )
             }
 
@@ -299,7 +299,7 @@ fun AscentlyApp(
                     },
                     onNavigateToProblemDetail = { problemId ->
                         navController.navigate(Screen.ProblemDetail(problemId))
-                    }
+                    },
                 )
             }
 
@@ -309,7 +309,7 @@ fun AscentlyApp(
                 AddEditGymScreen(
                     gymId = args.gymId,
                     viewModel = viewModel,
-                    onNavigateBack = { navController.popBackStack() }
+                    onNavigateBack = { navController.popBackStack() },
                 )
             }
 
@@ -320,7 +320,7 @@ fun AscentlyApp(
                     problemId = args.problemId,
                     gymId = args.gymId,
                     viewModel = viewModel,
-                    onNavigateBack = { navController.popBackStack() }
+                    onNavigateBack = { navController.popBackStack() },
                 )
             }
 
@@ -331,7 +331,7 @@ fun AscentlyApp(
                     sessionId = args.sessionId,
                     gymId = args.gymId,
                     viewModel = viewModel,
-                    onNavigateBack = { navController.popBackStack() }
+                    onNavigateBack = { navController.popBackStack() },
                 )
             }
         }
@@ -341,9 +341,9 @@ fun AscentlyApp(
                 onDismiss = { showNotificationPermissionDialog = false },
                 onRequestPermission = {
                     permissionLauncher.launch(
-                        NotificationPermissionUtils.getNotificationPermissionString()
+                        NotificationPermissionUtils.getNotificationPermissionString(),
                     )
-                }
+                },
             )
         }
     }
@@ -377,7 +377,7 @@ fun AscentlyBottomNavigation(navController: NavHostController) {
                         // Don't restore state - always start fresh when switching tabs
                         restoreState = false
                     }
-                }
+                },
             )
         }
     }
@@ -386,5 +386,5 @@ fun AscentlyBottomNavigation(navController: NavHostController) {
 data class FabConfig(
     val icon: androidx.compose.ui.graphics.vector.ImageVector,
     val contentDescription: String,
-    val onClick: () -> Unit
+    val onClick: () -> Unit,
 )

android/app/src/main/java/com/atridad/ascently/ui/components/ActiveSessionBanner.kt

@@ -13,8 +13,9 @@ import androidx.compose.ui.unit.dp
 import com.atridad.ascently.data.model.ClimbSession
 import com.atridad.ascently.data.model.Gym
 import com.atridad.ascently.ui.theme.CustomIcons
+import com.atridad.ascently.utils.DateFormatUtils
 import kotlinx.coroutines.delay
-import java.time.LocalDateTime
+import java.time.Instant
 import java.time.temporal.ChronoUnit
 
 @Composable
@@ -22,102 +23,113 @@ fun ActiveSessionBanner(
     activeSession: ClimbSession?,
     gym: Gym?,
     onSessionClick: () -> Unit,
-    onEndSession: () -> Unit
-) {    
-    if (activeSession != null) {
-        // Add a timer that updates every second for real-time duration counting
-        var currentTime by remember { mutableStateOf(LocalDateTime.now()) }
-        
-        LaunchedEffect(Unit) {
-            while (true) {
-                delay(1000) // Update every second
-                currentTime = LocalDateTime.now()
-            }
+    onEndSession: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    if (activeSession == null) return
+
+    val sessionId = activeSession.id
+    val startTimeString = activeSession.startTime
+    val gymName = gym?.name ?: "Unknown Gym"
+
+    var elapsedSeconds by remember(sessionId) { mutableLongStateOf(0L) }
+
+    LaunchedEffect(sessionId, startTimeString) {
+        if (startTimeString == null) return@LaunchedEffect
+
+        while (true) {
+            elapsedSeconds = calculateElapsedSeconds(startTimeString)
+            delay(1000)
         }
-        
-        Card(
+    }
+
+    val durationText = remember(elapsedSeconds) {
+        formatDuration(elapsedSeconds)
+    }
+
+    Card(
+        modifier = modifier
+            .fillMaxWidth()
+            .clickable { onSessionClick() },
+        colors = CardDefaults.cardColors(
+            containerColor = MaterialTheme.colorScheme.primaryContainer,
+        ),
+    ) {
+        Row(
             modifier = Modifier
                 .fillMaxWidth()
-                .clickable { onSessionClick() },
-            colors = CardDefaults.cardColors(
-                containerColor = MaterialTheme.colorScheme.primaryContainer
-            )
+                .padding(16.dp),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically,
         ) {
-            Row(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(16.dp),
-                horizontalArrangement = Arrangement.SpaceBetween,
-                verticalAlignment = Alignment.CenterVertically
-            ) {
-                Column(modifier = Modifier.weight(1f)) {
-                    Row(
-                        verticalAlignment = Alignment.CenterVertically
-                    ) {
-                        Icon(
-                            Icons.Default.PlayArrow,
-                            contentDescription = "Active session",
-                            tint = MaterialTheme.colorScheme.primary,
-                            modifier = Modifier.size(16.dp)
-                        )
-                        Spacer(modifier = Modifier.width(8.dp))
-                        Text(
-                            text = "Active Session",
-                            style = MaterialTheme.typography.titleSmall,
-                            fontWeight = FontWeight.Bold,
-                            color = MaterialTheme.colorScheme.onPrimaryContainer
-                        )
-                    }
-                    
-                    Spacer(modifier = Modifier.height(4.dp))
-                    
-                    Text(
-                        text = gym?.name ?: "Unknown Gym",
-                        style = MaterialTheme.typography.bodyMedium,
-                        color = MaterialTheme.colorScheme.onPrimaryContainer
-                    )
-                    
-                    activeSession.startTime?.let { startTime ->
-                        val duration = calculateDuration(startTime, currentTime)
-                        Text(
-                            text = duration,
-                            style = MaterialTheme.typography.bodySmall,
-                            color = MaterialTheme.colorScheme.onPrimaryContainer.copy(alpha = 0.8f)
-                        )
-                    }
-                }
-                
-                IconButton(
-                    onClick = onEndSession,
-                    colors = IconButtonDefaults.iconButtonColors(
-                        containerColor = MaterialTheme.colorScheme.error,
-                        contentColor = MaterialTheme.colorScheme.onError
-                    )
-                ) {
+            Column(modifier = Modifier.weight(1f)) {
+                Row(verticalAlignment = Alignment.CenterVertically) {
                     Icon(
-                        imageVector = CustomIcons.Stop(MaterialTheme.colorScheme.onError),
-                        contentDescription = "End session"
+                        Icons.Default.PlayArrow,
+                        contentDescription = null,
+                        tint = MaterialTheme.colorScheme.primary,
+                        modifier = Modifier.size(16.dp),
+                    )
+                    Spacer(modifier = Modifier.width(8.dp))
+                    Text(
+                        text = "Active Session",
+                        style = MaterialTheme.typography.titleSmall,
+                        fontWeight = FontWeight.Bold,
+                        color = MaterialTheme.colorScheme.onPrimaryContainer,
                     )
                 }
+
+                Spacer(modifier = Modifier.height(4.dp))
+
+                Text(
+                    text = gymName,
+                    style = MaterialTheme.typography.bodyMedium,
+                    color = MaterialTheme.colorScheme.onPrimaryContainer,
+                )
+
+                if (startTimeString != null) {
+                    Text(
+                        text = durationText,
+                        style = MaterialTheme.typography.bodySmall,
+                        color = MaterialTheme.colorScheme.onPrimaryContainer.copy(alpha = 0.8f),
+                    )
+                }
+            }
+
+            FilledIconButton(
+                onClick = onEndSession,
+                colors = IconButtonDefaults.filledIconButtonColors(
+                    containerColor = MaterialTheme.colorScheme.error,
+                    contentColor = MaterialTheme.colorScheme.onError,
+                ),
+            ) {
+                Icon(
+                    imageVector = CustomIcons.Stop(MaterialTheme.colorScheme.onError),
+                    contentDescription = "End session",
+                )
             }
         }
     }
 }
 
-private fun calculateDuration(startTimeString: String, currentTime: LocalDateTime): String {
+private fun calculateElapsedSeconds(startTimeString: String): Long {
     return try {
-        val startTime = LocalDateTime.parse(startTimeString)
-        val totalSeconds = ChronoUnit.SECONDS.between(startTime, currentTime)
-        val hours = totalSeconds / 3600
-        val minutes = (totalSeconds % 3600) / 60
-        val seconds = totalSeconds % 60
-        
-        when {
-            hours > 0 -> "${hours}h ${minutes}m ${seconds}s"
-            minutes > 0 -> "${minutes}m ${seconds}s"
-            else -> "${totalSeconds}s"
-        }
+        val startTime = DateFormatUtils.parseISO8601(startTimeString) ?: return 0L
+        val now = Instant.now()
+        ChronoUnit.SECONDS.between(startTime, now).coerceAtLeast(0)
     } catch (_: Exception) {
-        "Active"
+        0L
+    }
+}
+
+private fun formatDuration(totalSeconds: Long): String {
+    val hours = totalSeconds / 3600
+    val minutes = (totalSeconds % 3600) / 60
+    val seconds = totalSeconds % 60
+
+    return when {
+        hours > 0 -> "${hours}h ${minutes}m ${seconds}s"
+        minutes > 0 -> "${minutes}m ${seconds}s"
+        else -> "${seconds}s"
     }
 }

android/app/src/main/java/com/atridad/ascently/ui/components/BarChart.kt

@@ -23,25 +23,25 @@ data class BarChartDataPoint(val label: String, val value: Int, val gradeNumeric
 
 /** Configuration for bar chart styling */
 data class BarChartStyle(
-        val barColor: Color,
-        val gridColor: Color,
-        val textColor: Color,
-        val backgroundColor: Color
+    val barColor: Color,
+    val gridColor: Color,
+    val textColor: Color,
+    val backgroundColor: Color,
 )
 
 /** Custom Bar Chart for displaying grade distribution */
 @Composable
 fun BarChart(
-        data: List<BarChartDataPoint>,
-        modifier: Modifier = Modifier,
-        style: BarChartStyle =
-                BarChartStyle(
-                        barColor = MaterialTheme.colorScheme.primary,
-                        gridColor = MaterialTheme.colorScheme.outline.copy(alpha = 0.3f),
-                        textColor = MaterialTheme.colorScheme.onSurfaceVariant,
-                        backgroundColor = MaterialTheme.colorScheme.surface
-                ),
-        showGrid: Boolean = true
+    data: List<BarChartDataPoint>,
+    modifier: Modifier = Modifier,
+    style: BarChartStyle =
+        BarChartStyle(
+            barColor = MaterialTheme.colorScheme.primary,
+            gridColor = MaterialTheme.colorScheme.outline.copy(alpha = 0.3f),
+            textColor = MaterialTheme.colorScheme.onSurfaceVariant,
+            backgroundColor = MaterialTheme.colorScheme.surface,
+        ),
+    showGrid: Boolean = true,
 ) {
     val textMeasurer = rememberTextMeasurer()
     val density = LocalDensity.current
@@ -68,42 +68,44 @@ fun BarChart(
 
             // Draw background
             drawRect(
-                    color = style.backgroundColor,
-                    topLeft = Offset(padding, padding),
-                    size = androidx.compose.ui.geometry.Size(chartWidth, chartHeight)
+                color = style.backgroundColor,
+                topLeft = Offset(padding, padding),
+                size = androidx.compose.ui.geometry.Size(chartWidth, chartHeight),
             )
 
             // Draw grid
             if (showGrid) {
                 drawGrid(
-                        padding = padding,
-                        chartWidth = chartWidth,
-                        chartHeight = chartHeight,
-                        gridColor = style.gridColor,
-                        maxValue = maxValue,
-                        textMeasurer = textMeasurer,
-                        textColor = style.textColor
+                    padding = padding,
+                    chartWidth = chartWidth,
+                    chartHeight = chartHeight,
+                    gridColor = style.gridColor,
+                    maxValue = maxValue,
+                    textMeasurer = textMeasurer,
+                    textColor = style.textColor,
                 )
             }
 
             // Draw bars and labels
             sortedData.forEachIndexed { index, dataPoint ->
                 val barHeight =
-                        if (maxValue > 0) {
-                            (dataPoint.value.toFloat() / maxValue.toFloat()) * chartHeight * 0.8f
-                        } else 0f
+                    if (maxValue > 0) {
+                        (dataPoint.value.toFloat() / maxValue.toFloat()) * chartHeight * 0.8f
+                    } else {
+                        0f
+                    }
 
                 val barX =
-                        padding +
-                                barSpacing +
-                                index * (barWidth + barSpacing / (barCount - 1).coerceAtLeast(1))
+                    padding +
+                        barSpacing +
+                        index * (barWidth + barSpacing / (barCount - 1).coerceAtLeast(1))
                 val barY = padding + chartHeight - barHeight
 
                 // Draw bar
                 drawRect(
-                        color = style.barColor,
-                        topLeft = Offset(barX, barY),
-                        size = androidx.compose.ui.geometry.Size(barWidth, barHeight)
+                    color = style.barColor,
+                    topLeft = Offset(barX, barY),
+                    size = androidx.compose.ui.geometry.Size(barWidth, barHeight),
                 )
 
                 // Draw value on bar
@@ -114,24 +116,24 @@ fun BarChart(
 
                     // Position text
                     val textY =
-                            if (barHeight > textSize.size.height + 8.dp.toPx()) {
-                                barY + 8.dp.toPx()
-                            } else {
-                                barY - 4.dp.toPx()
-                            }
+                        if (barHeight > textSize.size.height + 8.dp.toPx()) {
+                            barY + 8.dp.toPx()
+                        } else {
+                            barY - 4.dp.toPx()
+                        }
 
                     val textColor =
-                            if (barHeight > textSize.size.height + 8.dp.toPx()) {
-                                Color.White
-                            } else {
-                                style.textColor
-                            }
+                        if (barHeight > textSize.size.height + 8.dp.toPx()) {
+                            Color.White
+                        } else {
+                            style.textColor
+                        }
 
                     drawText(
-                            textMeasurer = textMeasurer,
-                            text = valueText,
-                            style = textStyle.copy(color = textColor),
-                            topLeft = Offset(barX + barWidth / 2f - textSize.size.width / 2f, textY)
+                        textMeasurer = textMeasurer,
+                        text = valueText,
+                        style = textStyle.copy(color = textColor),
+                        topLeft = Offset(barX + barWidth / 2f - textSize.size.width / 2f, textY),
                     )
                 }
 
@@ -141,14 +143,14 @@ fun BarChart(
                 val labelTextSize = textMeasurer.measure(gradeText, labelTextStyle)
 
                 drawText(
-                        textMeasurer = textMeasurer,
-                        text = gradeText,
-                        style = labelTextStyle,
-                        topLeft =
-                                Offset(
-                                        barX + barWidth / 2f - labelTextSize.size.width / 2f,
-                                        padding + chartHeight + 8.dp.toPx()
-                                )
+                    textMeasurer = textMeasurer,
+                    text = gradeText,
+                    style = labelTextStyle,
+                    topLeft =
+                    Offset(
+                        barX + barWidth / 2f - labelTextSize.size.width / 2f,
+                        padding + chartHeight + 8.dp.toPx(),
+                    ),
                 )
             }
         }
@@ -156,37 +158,37 @@ fun BarChart(
 }
 
 private fun DrawScope.drawGrid(
-        padding: Float,
-        chartWidth: Float,
-        chartHeight: Float,
-        gridColor: Color,
-        maxValue: Int,
-        textMeasurer: TextMeasurer,
-        textColor: Color
+    padding: Float,
+    chartWidth: Float,
+    chartHeight: Float,
+    gridColor: Color,
+    maxValue: Int,
+    textMeasurer: TextMeasurer,
+    textColor: Color,
 ) {
     val textStyle = TextStyle(color = textColor, fontSize = 10.sp)
 
     // Horizontal grid lines
     val gridLines =
-            when {
-                maxValue <= 5 -> (0..maxValue).toList()
-                maxValue <= 10 -> (0..maxValue step 2).toList()
-                maxValue <= 20 -> (0..maxValue step 5).toList()
-                else -> {
-                    val step = (maxValue / 5).coerceAtLeast(1)
-                    (0..maxValue step step).toList()
-                }
+        when {
+            maxValue <= 5 -> (0..maxValue).toList()
+            maxValue <= 10 -> (0..maxValue step 2).toList()
+            maxValue <= 20 -> (0..maxValue step 5).toList()
+            else -> {
+                val step = (maxValue / 5).coerceAtLeast(1)
+                (0..maxValue step step).toList()
             }
+        }
 
     gridLines.forEach { value ->
         val y = padding + chartHeight - (value.toFloat() / maxValue.toFloat()) * chartHeight * 0.8f
 
         // Draw grid line
         drawLine(
-                color = gridColor,
-                start = Offset(padding, y),
-                end = Offset(padding + chartWidth, y),
-                strokeWidth = 1.dp.toPx()
+            color = gridColor,
+            start = Offset(padding, y),
+            end = Offset(padding + chartWidth, y),
+            strokeWidth = 1.dp.toPx(),
         )
 
         // Draw Y-axis label
@@ -194,14 +196,14 @@ private fun DrawScope.drawGrid(
             val text = value.toString()
             val textSize = textMeasurer.measure(text, textStyle)
             drawText(
-                    textMeasurer = textMeasurer,
-                    text = text,
-                    style = textStyle,
-                    topLeft =
-                            Offset(
-                                    padding - textSize.size.width - 8.dp.toPx(),
-                                    y - textSize.size.height / 2f
-                            )
+                textMeasurer = textMeasurer,
+                text = text,
+                style = textStyle,
+                topLeft =
+                Offset(
+                    padding - textSize.size.width - 8.dp.toPx(),
+                    y - textSize.size.height / 2f,
+                ),
             )
         }
     }

android/app/src/main/java/com/atridad/ascently/ui/components/FullscreenImageViewer.kt

@@ -40,44 +40,44 @@ fun FullscreenImageViewer(imagePaths: List<String>, initialIndex: Int = 0, onDis
     LaunchedEffect(pagerState.currentPage) {
         if (imagePaths.size > 1) {
             thumbnailListState.animateScrollToItem(
-                    index = pagerState.currentPage,
-                    scrollOffset = -200
+                index = pagerState.currentPage,
+                scrollOffset = -200,
             )
         }
     }
 
     Dialog(
-            onDismissRequest = onDismiss,
-            properties =
-                    DialogProperties(usePlatformDefaultWidth = false, decorFitsSystemWindows = true)
+        onDismissRequest = onDismiss,
+        properties =
+        DialogProperties(usePlatformDefaultWidth = false, decorFitsSystemWindows = true),
     ) {
         Box(modifier = Modifier.fillMaxSize().background(Color.Black).systemBarsPadding()) {
             // Main image pager
             HorizontalPager(state = pagerState, modifier = Modifier.fillMaxSize()) { page ->
                 OrientationAwareImage(
-                        imagePath = imagePaths[page],
-                        contentDescription = "Full screen image",
-                        modifier = Modifier.fillMaxSize(),
-                        contentScale = ContentScale.Fit
+                    imagePath = imagePaths[page],
+                    contentDescription = "Full screen image",
+                    modifier = Modifier.fillMaxSize(),
+                    contentScale = ContentScale.Fit,
                 )
             }
 
             // Top bar with back button and counter
             Surface(
-                    modifier = Modifier.fillMaxWidth().align(Alignment.TopStart),
-                    color = Color.Black.copy(alpha = 0.6f)
+                modifier = Modifier.fillMaxWidth().align(Alignment.TopStart),
+                color = Color.Black.copy(alpha = 0.6f),
             ) {
                 Row(
-                        modifier =
-                                Modifier.fillMaxWidth().padding(horizontal = 4.dp, vertical = 8.dp),
-                        verticalAlignment = Alignment.CenterVertically
+                    modifier =
+                    Modifier.fillMaxWidth().padding(horizontal = 4.dp, vertical = 8.dp),
+                    verticalAlignment = Alignment.CenterVertically,
                 ) {
                     // Back button
                     IconButton(onClick = onDismiss) {
                         Icon(
-                                imageVector = Icons.AutoMirrored.Filled.ArrowBack,
-                                contentDescription = "Close",
-                                tint = Color.White
+                            imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+                            contentDescription = "Close",
+                            tint = Color.White,
                         )
                     }
 
@@ -86,9 +86,9 @@ fun FullscreenImageViewer(imagePaths: List<String>, initialIndex: Int = 0, onDis
                     // Image counter
                     if (imagePaths.size > 1) {
                         Text(
-                                text = "${pagerState.currentPage + 1} / ${imagePaths.size}",
-                                color = Color.White,
-                                style = MaterialTheme.typography.bodyMedium
+                            text = "${pagerState.currentPage + 1} / ${imagePaths.size}",
+                            color = Color.White,
+                            style = MaterialTheme.typography.bodyMedium,
                         )
                     }
 
@@ -99,56 +99,56 @@ fun FullscreenImageViewer(imagePaths: List<String>, initialIndex: Int = 0, onDis
             // Thumbnail strip at bottom (if multiple images)
             if (imagePaths.size > 1) {
                 Surface(
-                        modifier = Modifier.fillMaxWidth().align(Alignment.BottomCenter),
-                        color = Color.Black.copy(alpha = 0.6f)
+                    modifier = Modifier.fillMaxWidth().align(Alignment.BottomCenter),
+                    color = Color.Black.copy(alpha = 0.6f),
                 ) {
                     LazyRow(
-                            state = thumbnailListState,
-                            modifier = Modifier.padding(vertical = 12.dp),
-                            horizontalArrangement = Arrangement.spacedBy(8.dp),
-                            contentPadding = PaddingValues(horizontal = 16.dp)
+                        state = thumbnailListState,
+                        modifier = Modifier.padding(vertical = 12.dp),
+                        horizontalArrangement = Arrangement.spacedBy(8.dp),
+                        contentPadding = PaddingValues(horizontal = 16.dp),
                     ) {
                         itemsIndexed(imagePaths) { index, imagePath ->
                             val isSelected = index == pagerState.currentPage
 
                             Box(
-                                    modifier =
-                                            Modifier.size(48.dp)
-                                                    .clip(RoundedCornerShape(8.dp))
-                                                    .clickable {
-                                                        coroutineScope.launch {
-                                                            pagerState.animateScrollToPage(index)
-                                                        }
-                                                    }
+                                modifier =
+                                Modifier.size(48.dp)
+                                    .clip(RoundedCornerShape(8.dp))
+                                    .clickable {
+                                        coroutineScope.launch {
+                                            pagerState.animateScrollToPage(index)
+                                        }
+                                    },
                             ) {
                                 OrientationAwareImage(
-                                        imagePath = imagePath,
-                                        contentDescription = "Thumbnail ${index + 1}",
-                                        modifier = Modifier.fillMaxSize(),
-                                        contentScale = ContentScale.Crop
+                                    imagePath = imagePath,
+                                    contentDescription = "Thumbnail ${index + 1}",
+                                    modifier = Modifier.fillMaxSize(),
+                                    contentScale = ContentScale.Crop,
                                 )
 
                                 // Selection indicator
                                 if (isSelected) {
                                     Box(
-                                            modifier =
-                                                    Modifier.fillMaxSize()
-                                                            .background(
-                                                                    Color.White.copy(alpha = 0.3f),
-                                                                    RoundedCornerShape(8.dp)
-                                                            )
+                                        modifier =
+                                        Modifier.fillMaxSize()
+                                            .background(
+                                                Color.White.copy(alpha = 0.3f),
+                                                RoundedCornerShape(8.dp),
+                                            ),
                                     )
                                     Box(
-                                            modifier =
-                                                    Modifier.fillMaxSize()
-                                                            .background(
-                                                                    Color.Transparent,
-                                                                    RoundedCornerShape(8.dp)
-                                                            )
-                                                            .clip(RoundedCornerShape(8.dp))
-                                                            .background(
-                                                                    Color.White.copy(alpha = 0.2f)
-                                                            )
+                                        modifier =
+                                        Modifier.fillMaxSize()
+                                            .background(
+                                                Color.Transparent,
+                                                RoundedCornerShape(8.dp),
+                                            )
+                                            .clip(RoundedCornerShape(8.dp))
+                                            .background(
+                                                Color.White.copy(alpha = 0.2f),
+                                            ),
                                     )
                                 }
                             }

android/app/src/main/java/com/atridad/ascently/ui/components/ImageDisplay.kt

@@ -15,10 +15,10 @@ import androidx.compose.ui.unit.dp
 
 @Composable
 fun ImageDisplay(
-        imagePaths: List<String>,
-        modifier: Modifier = Modifier,
-        imageSize: Int = 120,
-        onImageClick: ((Int) -> Unit)? = null
+    imagePaths: List<String>,
+    modifier: Modifier = Modifier,
+    imageSize: Int = 120,
+    onImageClick: ((Int) -> Unit)? = null,
 ) {
     LocalContext.current
 
@@ -26,15 +26,15 @@ fun ImageDisplay(
         LazyRow(modifier = modifier, horizontalArrangement = Arrangement.spacedBy(8.dp)) {
             itemsIndexed(imagePaths) { index, imagePath ->
                 OrientationAwareImage(
-                        imagePath = imagePath,
-                        contentDescription = "Problem photo",
-                        modifier =
-                                Modifier.size(imageSize.dp)
-                                        .clip(RoundedCornerShape(8.dp))
-                                        .clickable(enabled = onImageClick != null) {
-                                            onImageClick?.invoke(index)
-                                        },
-                        contentScale = ContentScale.Crop
+                    imagePath = imagePath,
+                    contentDescription = "Problem photo",
+                    modifier =
+                    Modifier.size(imageSize.dp)
+                        .clip(RoundedCornerShape(8.dp))
+                        .clickable(enabled = onImageClick != null) {
+                            onImageClick?.invoke(index)
+                        },
+                    contentScale = ContentScale.Crop,
                 )
             }
         }
@@ -43,17 +43,17 @@ fun ImageDisplay(
 
 @Composable
 fun ImageDisplaySection(
-        imagePaths: List<String>,
-        modifier: Modifier = Modifier,
-        title: String = "Photos",
-        onImageClick: ((Int) -> Unit)? = null
+    imagePaths: List<String>,
+    modifier: Modifier = Modifier,
+    title: String = "Photos",
+    onImageClick: ((Int) -> Unit)? = null,
 ) {
     if (imagePaths.isNotEmpty()) {
         Column(modifier = modifier) {
             Text(
-                    text = title,
-                    style = MaterialTheme.typography.titleMedium,
-                    color = MaterialTheme.colorScheme.onSurface
+                text = title,
+                style = MaterialTheme.typography.titleMedium,
+                color = MaterialTheme.colorScheme.onSurface,
             )
 
             Spacer(modifier = Modifier.height(8.dp))

android/app/src/main/java/com/atridad/ascently/ui/components/ImagePicker.kt

@@ -32,10 +32,10 @@ import java.util.*
 
 @Composable
 fun ImagePicker(
-        imageUris: List<String>,
-        onImagesChanged: (List<String>) -> Unit,
-        modifier: Modifier = Modifier,
-        maxImages: Int = 5
+    imageUris: List<String>,
+    onImagesChanged: (List<String>) -> Unit,
+    modifier: Modifier = Modifier,
+    maxImages: Int = 5,
 ) {
     val context = LocalContext.current
     var tempImageUris by remember { mutableStateOf(imageUris) }
@@ -44,83 +44,83 @@ fun ImagePicker(
 
     // Image picker launcher
     val imagePickerLauncher =
-            rememberLauncherForActivityResult(
-                    contract = ActivityResultContracts.GetMultipleContents()
-            ) { uris ->
-                if (uris.isNotEmpty()) {
-                    val currentCount = tempImageUris.size
-                    val remainingSlots = maxImages - currentCount
-                    val urisToProcess = uris.take(remainingSlots)
+        rememberLauncherForActivityResult(
+            contract = ActivityResultContracts.GetMultipleContents(),
+        ) { uris ->
+            if (uris.isNotEmpty()) {
+                val currentCount = tempImageUris.size
+                val remainingSlots = maxImages - currentCount
+                val urisToProcess = uris.take(remainingSlots)
 
-                    // Process images
-                    val newImagePaths = mutableListOf<String>()
-                    urisToProcess.forEach { uri ->
-                        val imagePath = ImageUtils.saveTemporaryImageFromUri(context, uri)
-                        if (imagePath != null) {
-                            newImagePaths.add(imagePath)
-                        }
+                // Process images
+                val newImagePaths = mutableListOf<String>()
+                urisToProcess.forEach { uri ->
+                    val imagePath = ImageUtils.saveTemporaryImageFromUri(context, uri)
+                    if (imagePath != null) {
+                        newImagePaths.add(imagePath)
                     }
+                }
 
-                    if (newImagePaths.isNotEmpty()) {
-                        val updatedUris = tempImageUris + newImagePaths
+                if (newImagePaths.isNotEmpty()) {
+                    val updatedUris = tempImageUris + newImagePaths
+                    tempImageUris = updatedUris
+                    onImagesChanged(updatedUris)
+                }
+            }
+        }
+
+    // Camera launcher
+    val cameraLauncher =
+        rememberLauncherForActivityResult(contract = ActivityResultContracts.TakePicture()) {
+                success ->
+            if (success) {
+                cameraImageUri?.let { uri ->
+                    val imagePath = ImageUtils.saveTemporaryImageFromUri(context, uri)
+                    if (imagePath != null) {
+                        val updatedUris = tempImageUris + imagePath
                         tempImageUris = updatedUris
                         onImagesChanged(updatedUris)
                     }
                 }
             }
-
-    // Camera launcher
-    val cameraLauncher =
-            rememberLauncherForActivityResult(contract = ActivityResultContracts.TakePicture()) {
-                    success ->
-                if (success) {
-                    cameraImageUri?.let { uri ->
-                        val imagePath = ImageUtils.saveTemporaryImageFromUri(context, uri)
-                        if (imagePath != null) {
-                            val updatedUris = tempImageUris + imagePath
-                            tempImageUris = updatedUris
-                            onImagesChanged(updatedUris)
-                        }
-                    }
-                }
-            }
+        }
 
     // Camera permission launcher
     val cameraPermissionLauncher =
-            rememberLauncherForActivityResult(
-                    contract = ActivityResultContracts.RequestPermission()
-            ) { isGranted ->
-                if (isGranted) {
-                    // Create image file for camera
-                    val imageFile = createImageFile(context)
-                    val uri =
-                            FileProvider.getUriForFile(
-                                    context,
-                                    "${context.packageName}.fileprovider",
-                                    imageFile
-                            )
-                    cameraImageUri = uri
-                    cameraLauncher.launch(uri)
-                }
+        rememberLauncherForActivityResult(
+            contract = ActivityResultContracts.RequestPermission(),
+        ) { isGranted ->
+            if (isGranted) {
+                // Create image file for camera
+                val imageFile = createImageFile(context)
+                val uri =
+                    FileProvider.getUriForFile(
+                        context,
+                        "${context.packageName}.fileprovider",
+                        imageFile,
+                    )
+                cameraImageUri = uri
+                cameraLauncher.launch(uri)
             }
+        }
 
     Column(modifier = modifier) {
         Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.SpaceBetween,
-                verticalAlignment = Alignment.CenterVertically
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically,
         ) {
             Text(
-                    text = "Photos (${tempImageUris.size}/$maxImages)",
-                    style = MaterialTheme.typography.titleMedium
+                text = "Photos (${tempImageUris.size}/$maxImages)",
+                style = MaterialTheme.typography.titleMedium,
             )
 
             if (tempImageUris.size < maxImages) {
                 TextButton(onClick = { showImageSourceDialog = true }) {
                     Icon(
-                            Icons.Default.Add,
-                            contentDescription = null,
-                            modifier = Modifier.size(16.dp)
+                        Icons.Default.Add,
+                        contentDescription = null,
+                        modifier = Modifier.size(16.dp),
                     )
                     Spacer(modifier = Modifier.width(4.dp))
                     Text("Add Photos")
@@ -134,42 +134,42 @@ fun ImagePicker(
             LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
                 items(tempImageUris) { imagePath ->
                     ImageItem(
-                            imagePath = imagePath,
-                            onRemove = {
-                                val updatedUris = tempImageUris.filter { it != imagePath }
-                                tempImageUris = updatedUris
-                                onImagesChanged(updatedUris)
+                        imagePath = imagePath,
+                        onRemove = {
+                            val updatedUris = tempImageUris.filter { it != imagePath }
+                            tempImageUris = updatedUris
+                            onImagesChanged(updatedUris)
 
-                                // Delete the image file
-                                ImageUtils.deleteImage(context, imagePath)
-                            }
+                            // Delete the image file
+                            ImageUtils.deleteImage(context, imagePath)
+                        },
                     )
                 }
             }
         } else {
             Spacer(modifier = Modifier.height(8.dp))
             Card(
-                    modifier = Modifier.fillMaxWidth().height(100.dp),
-                    colors =
-                            CardDefaults.cardColors(
-                                    containerColor =
-                                            MaterialTheme.colorScheme.surfaceVariant.copy(
-                                                    alpha = 0.3f
-                                            )
-                            )
+                modifier = Modifier.fillMaxWidth().height(100.dp),
+                colors =
+                CardDefaults.cardColors(
+                    containerColor =
+                    MaterialTheme.colorScheme.surfaceVariant.copy(
+                        alpha = 0.3f,
+                    ),
+                ),
             ) {
                 Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
                     Column(horizontalAlignment = Alignment.CenterHorizontally) {
                         Icon(
-                                Icons.Default.Add,
-                                contentDescription = null,
-                                tint = MaterialTheme.colorScheme.onSurfaceVariant
+                            Icons.Default.Add,
+                            contentDescription = null,
+                            tint = MaterialTheme.colorScheme.onSurfaceVariant,
                         )
                         Spacer(modifier = Modifier.height(4.dp))
                         Text(
-                                text = "Add photos of this problem",
-                                style = MaterialTheme.typography.bodySmall,
-                                color = MaterialTheme.colorScheme.onSurfaceVariant
+                            text = "Add photos of this problem",
+                            style = MaterialTheme.typography.bodySmall,
+                            color = MaterialTheme.colorScheme.onSurfaceVariant,
                         )
                     }
                 }
@@ -179,67 +179,68 @@ fun ImagePicker(
         // Image Source Selection Dialog
         if (showImageSourceDialog) {
             AlertDialog(
-                    onDismissRequest = { showImageSourceDialog = false },
-                    title = { Text("Add Photo") },
-                    text = { Text("Choose how you'd like to add a photo") },
-                    confirmButton = {
-                        Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                            TextButton(
-                                    onClick = {
-                                        showImageSourceDialog = false
-                                        imagePickerLauncher.launch("image/*")
-                                    }
-                            ) {
-                                Icon(
-                                        Icons.Default.PhotoLibrary,
-                                        contentDescription = null,
-                                        modifier = Modifier.size(16.dp)
-                                )
-                                Spacer(modifier = Modifier.width(4.dp))
-                                Text("Gallery")
-                            }
-
-                            TextButton(
-                                    onClick = {
-                                        showImageSourceDialog = false
-                                        when (ContextCompat.checkSelfPermission(
-                                                        context,
-                                                        Manifest.permission.CAMERA
-                                                )
-                                        ) {
-                                            PackageManager.PERMISSION_GRANTED -> {
-                                                // Create image file for camera
-                                                val imageFile = createImageFile(context)
-                                                val uri =
-                                                        FileProvider.getUriForFile(
-                                                                context,
-                                                                "${context.packageName}.fileprovider",
-                                                                imageFile
-                                                        )
-                                                cameraImageUri = uri
-                                                cameraLauncher.launch(uri)
-                                            }
-                                            else -> {
-                                                cameraPermissionLauncher.launch(
-                                                        Manifest.permission.CAMERA
-                                                )
-                                            }
-                                        }
-                                    }
-                            ) {
-                                Icon(
-                                        Icons.Default.CameraAlt,
-                                        contentDescription = null,
-                                        modifier = Modifier.size(16.dp)
-                                )
-                                Spacer(modifier = Modifier.width(4.dp))
-                                Text("Camera")
-                            }
+                onDismissRequest = { showImageSourceDialog = false },
+                title = { Text("Add Photo") },
+                text = { Text("Choose how you'd like to add a photo") },
+                confirmButton = {
+                    Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                        TextButton(
+                            onClick = {
+                                showImageSourceDialog = false
+                                imagePickerLauncher.launch("image/*")
+                            },
+                        ) {
+                            Icon(
+                                Icons.Default.PhotoLibrary,
+                                contentDescription = null,
+                                modifier = Modifier.size(16.dp),
+                            )
+                            Spacer(modifier = Modifier.width(4.dp))
+                            Text("Gallery")
+                        }
+
+                        TextButton(
+                            onClick = {
+                                showImageSourceDialog = false
+                                when (
+                                    ContextCompat.checkSelfPermission(
+                                        context,
+                                        Manifest.permission.CAMERA,
+                                    )
+                                ) {
+                                    PackageManager.PERMISSION_GRANTED -> {
+                                        // Create image file for camera
+                                        val imageFile = createImageFile(context)
+                                        val uri =
+                                            FileProvider.getUriForFile(
+                                                context,
+                                                "${context.packageName}.fileprovider",
+                                                imageFile,
+                                            )
+                                        cameraImageUri = uri
+                                        cameraLauncher.launch(uri)
+                                    }
+                                    else -> {
+                                        cameraPermissionLauncher.launch(
+                                            Manifest.permission.CAMERA,
+                                        )
+                                    }
+                                }
+                            },
+                        ) {
+                            Icon(
+                                Icons.Default.CameraAlt,
+                                contentDescription = null,
+                                modifier = Modifier.size(16.dp),
+                            )
+                            Spacer(modifier = Modifier.width(4.dp))
+                            Text("Camera")
                         }
-                    },
-                    dismissButton = {
-                        TextButton(onClick = { showImageSourceDialog = false }) { Text("Cancel") }
                     }
+                },
+                dismissButton = {
+                    TextButton(onClick = { showImageSourceDialog = false }) { Text("Cancel") }
+                },
             )
         }
     }
@@ -259,25 +260,25 @@ private fun ImageItem(imagePath: String, onRemove: () -> Unit, modifier: Modifie
 
     Box(modifier = modifier.size(80.dp)) {
         OrientationAwareImage(
-                imagePath = imagePath,
-                contentDescription = "Problem photo",
-                modifier = Modifier.fillMaxSize().clip(RoundedCornerShape(8.dp)),
-                contentScale = ContentScale.Crop
+            imagePath = imagePath,
+            contentDescription = "Problem photo",
+            modifier = Modifier.fillMaxSize().clip(RoundedCornerShape(8.dp)),
+            contentScale = ContentScale.Crop,
         )
 
         IconButton(onClick = onRemove, modifier = Modifier.align(Alignment.TopEnd).size(24.dp)) {
             Card(
-                    shape = RoundedCornerShape(12.dp),
-                    colors =
-                            CardDefaults.cardColors(
-                                    containerColor = MaterialTheme.colorScheme.errorContainer
-                            )
+                shape = RoundedCornerShape(12.dp),
+                colors =
+                CardDefaults.cardColors(
+                    containerColor = MaterialTheme.colorScheme.errorContainer,
+                ),
             ) {
                 Icon(
-                        Icons.Default.Close,
-                        contentDescription = "Remove photo",
-                        modifier = Modifier.fillMaxSize().padding(2.dp),
-                        tint = MaterialTheme.colorScheme.onErrorContainer
+                    Icons.Default.Close,
+                    contentDescription = "Remove photo",
+                    modifier = Modifier.fillMaxSize().padding(2.dp),
+                    tint = MaterialTheme.colorScheme.onErrorContainer,
                 )
             }
         }

android/app/src/main/java/com/atridad/ascently/ui/components/LineChart.kt

@@ -25,7 +25,7 @@ import androidx.compose.ui.unit.sp
 data class ChartDataPoint(
     val x: Float,
     val y: Float,
-    val label: String? = null
+    val label: String? = null,
 )
 
 /**
@@ -37,7 +37,7 @@ data class ChartStyle(
     val lineWidth: Float = 3f,
     val gridColor: Color,
     val textColor: Color,
-    val backgroundColor: Color
+    val backgroundColor: Color,
 )
 
 /**
@@ -52,59 +52,59 @@ fun LineChart(
         fillColor = MaterialTheme.colorScheme.primary.copy(alpha = 0.2f),
         gridColor = MaterialTheme.colorScheme.outline.copy(alpha = 0.3f),
         textColor = MaterialTheme.colorScheme.onSurfaceVariant,
-        backgroundColor = MaterialTheme.colorScheme.surface
+        backgroundColor = MaterialTheme.colorScheme.surface,
     ),
     showGrid: Boolean = true,
     xAxisFormatter: (Float) -> String = { it.toString() },
-    yAxisFormatter: (Float) -> String = { it.toString() }
+    yAxisFormatter: (Float) -> String = { it.toString() },
 ) {
     val textMeasurer = rememberTextMeasurer()
     val density = LocalDensity.current
-    
+
     Box(modifier = modifier) {
         Canvas(
             modifier = Modifier
                 .fillMaxSize()
-                .padding(16.dp)
+                .padding(16.dp),
         ) {
             if (data.isEmpty()) return@Canvas
-            
+
             val padding = with(density) { 32.dp.toPx() }
             val chartWidth = size.width - padding * 2
             val chartHeight = size.height - padding * 2
-            
+
             // Calculate data bounds
             val dataMinY = data.minOf { it.y }
             val dataMaxY = data.maxOf { it.y }
-            
+
             // Add some padding to Y-axis (10% above and below the data range)
             val yPadding = if (dataMaxY == dataMinY) 1f else (dataMaxY - dataMinY) * 0.1f
             val minY = dataMinY - yPadding
             val maxY = dataMaxY + yPadding
-            
+
             val minX = data.minOf { it.x }
             val maxX = data.maxOf { it.x }
-            
+
             val xRange = if (maxX - minX == 0f) 1f else maxX - minX // Minimum range of 1 for single points
             val yRange = maxY - minY
-            
+
             // Ensure we have valid ranges
             if (yRange == 0f) return@Canvas
-            
+
             // Convert data points to screen coordinates
             val screenPoints = data.map { point ->
                 val x = padding + (point.x - minX) / xRange * chartWidth
                 val y = padding + chartHeight - (point.y - minY) / yRange * chartHeight
                 Offset(x, y)
             }
-            
+
             // Draw background
             drawRect(
                 color = style.backgroundColor,
                 topLeft = Offset(padding, padding),
-                size = androidx.compose.ui.geometry.Size(chartWidth, chartHeight)
+                size = androidx.compose.ui.geometry.Size(chartWidth, chartHeight),
             )
-            
+
             // Draw grid
             if (showGrid) {
                 drawGrid(
@@ -120,49 +120,49 @@ fun LineChart(
                     textColor = style.textColor,
                     xAxisFormatter = xAxisFormatter,
                     yAxisFormatter = yAxisFormatter,
-                    actualDataPoints = data
+                    actualDataPoints = data,
                 )
             }
-            
+
             // Draw area fill
             if (screenPoints.size > 1) {
                 drawAreaFill(
                     points = screenPoints,
                     padding = padding,
                     chartHeight = chartHeight,
-                    fillColor = style.fillColor
+                    fillColor = style.fillColor,
                 )
             }
-            
+
             // Draw line
             if (screenPoints.size > 1) {
                 drawLine(
                     points = screenPoints,
                     lineColor = style.lineColor,
-                    lineWidth = style.lineWidth
+                    lineWidth = style.lineWidth,
                 )
             }
-            
+
             // Draw data points - more pronounced
             screenPoints.forEach { point ->
                 // Draw outer circle (larger)
                 drawCircle(
                     color = style.lineColor,
                     radius = 8f,
-                    center = point
+                    center = point,
                 )
                 // Draw inner circle (white center)
                 drawCircle(
                     color = style.backgroundColor,
                     radius = 5f,
-                    center = point
+                    center = point,
                 )
                 // Draw border for better visibility
                 drawCircle(
                     color = style.lineColor,
                     radius = 8f,
                     center = point,
-                    style = Stroke(width = 2f)
+                    style = Stroke(width = 2f),
                 )
             }
         }
@@ -182,43 +182,43 @@ private fun DrawScope.drawGrid(
     textColor: Color,
     xAxisFormatter: (Float) -> String,
     yAxisFormatter: (Float) -> String,
-    actualDataPoints: List<ChartDataPoint>
+    actualDataPoints: List<ChartDataPoint>,
 ) {
     val textStyle = TextStyle(
         color = textColor,
-        fontSize = 10.sp
+        fontSize = 10.sp,
     )
-    
+
     // Draw vertical grid lines (X-axis) - only at integer values for sessions
     val xRange = maxX - minX
     if (xRange > 0) {
         val startX = kotlin.math.ceil(minX).toInt()
         val endX = kotlin.math.floor(maxX).toInt()
-        
+
         for (sessionNum in startX..endX) {
             val x = padding + (sessionNum.toFloat() - minX) / xRange * chartWidth
-            
+
             // Draw grid line
             drawLine(
                 color = gridColor,
                 start = Offset(x, padding),
                 end = Offset(x, padding + chartHeight),
-                strokeWidth = 1.dp.toPx()
+                strokeWidth = 1.dp.toPx(),
             )
-            
+
             // X-axis labels removed per user request
         }
     }
-    
+
     // Draw horizontal grid lines (Y-axis) - only at actual data point values
     val yRange = maxY - minY
     if (yRange > 0) {
         // Get unique Y values from actual data points
         val actualYValues = actualDataPoints.map { kotlin.math.round(it.y).toInt() }.toSet()
-        
+
         actualYValues.forEach { gradeValue ->
             val y = padding + chartHeight - (gradeValue.toFloat() - minY) / yRange * chartHeight
-            
+
             // Only draw if within chart bounds
             if (y >= padding && y <= padding + chartHeight) {
                 // Draw grid line
@@ -226,9 +226,9 @@ private fun DrawScope.drawGrid(
                     color = gridColor,
                     start = Offset(padding, y),
                     end = Offset(padding + chartWidth, y),
-                    strokeWidth = 1.dp.toPx()
+                    strokeWidth = 1.dp.toPx(),
                 )
-                
+
                 // Draw label
                 val text = yAxisFormatter(gradeValue.toFloat())
                 val textSize = textMeasurer.measure(text, textStyle)
@@ -238,8 +238,8 @@ private fun DrawScope.drawGrid(
                     style = textStyle,
                     topLeft = Offset(
                         padding - textSize.size.width - 8.dp.toPx(),
-                        y - textSize.size.height / 2f
-                    )
+                        y - textSize.size.height / 2f,
+                    ),
                 )
             }
         }
@@ -250,38 +250,38 @@ private fun DrawScope.drawAreaFill(
     points: List<Offset>,
     padding: Float,
     chartHeight: Float,
-    fillColor: Color
+    fillColor: Color,
 ) {
     val bottomY = padding + chartHeight // This represents the bottom of the chart area
-    
+
     val path = Path().apply {
         // Start from bottom-left (at chart bottom level)
         moveTo(points.first().x, bottomY)
-        
+
         // Draw to first point
         lineTo(points.first().x, points.first().y)
-        
+
         // Draw line through all points
         for (i in 1 until points.size) {
             lineTo(points[i].x, points[i].y)
         }
-        
+
         // Close the path by going to bottom-right (at chart bottom level) and back to start
         lineTo(points.last().x, bottomY)
         lineTo(points.first().x, bottomY)
         close()
     }
-    
+
     drawPath(
         path = path,
-        color = fillColor
+        color = fillColor,
     )
 }
 
 private fun DrawScope.drawLine(
     points: List<Offset>,
     lineColor: Color,
-    lineWidth: Float
+    lineWidth: Float,
 ) {
     val path = Path().apply {
         moveTo(points.first().x, points.first().y)
@@ -289,14 +289,14 @@ private fun DrawScope.drawLine(
             lineTo(points[i].x, points[i].y)
         }
     }
-    
+
     drawPath(
         path = path,
         color = lineColor,
         style = Stroke(
             width = lineWidth,
             cap = StrokeCap.Round,
-            join = StrokeJoin.Round
-        )
+            join = StrokeJoin.Round,
+        ),
     )
 }

android/app/src/main/java/com/atridad/ascently/ui/components/NotificationPermissionDialog.kt

@@ -15,59 +15,59 @@ import androidx.compose.ui.window.DialogProperties
 @Composable
 fun NotificationPermissionDialog(onDismiss: () -> Unit, onRequestPermission: () -> Unit) {
     Dialog(
-            onDismissRequest = onDismiss,
-            properties = DialogProperties(dismissOnBackPress = false, dismissOnClickOutside = false)
+        onDismissRequest = onDismiss,
+        properties = DialogProperties(dismissOnBackPress = false, dismissOnClickOutside = false),
     ) {
         Card(
-                modifier = Modifier.fillMaxWidth().padding(16.dp),
-                shape = MaterialTheme.shapes.medium
+            modifier = Modifier.fillMaxWidth().padding(16.dp),
+            shape = MaterialTheme.shapes.medium,
         ) {
             Column(
-                    modifier = Modifier.padding(24.dp),
-                    horizontalAlignment = Alignment.CenterHorizontally
+                modifier = Modifier.padding(24.dp),
+                horizontalAlignment = Alignment.CenterHorizontally,
             ) {
                 Icon(
-                        imageVector = Icons.Default.Notifications,
-                        contentDescription = "Notifications",
-                        modifier = Modifier.size(48.dp),
-                        tint = MaterialTheme.colorScheme.primary
+                    imageVector = Icons.Default.Notifications,
+                    contentDescription = "Notifications",
+                    modifier = Modifier.size(48.dp),
+                    tint = MaterialTheme.colorScheme.primary,
                 )
 
                 Spacer(modifier = Modifier.height(16.dp))
 
                 Text(
-                        text = "Enable Notifications",
-                        style = MaterialTheme.typography.headlineSmall,
-                        fontWeight = MaterialTheme.typography.headlineSmall.fontWeight,
-                        textAlign = TextAlign.Center
+                    text = "Enable Notifications",
+                    style = MaterialTheme.typography.headlineSmall,
+                    fontWeight = MaterialTheme.typography.headlineSmall.fontWeight,
+                    textAlign = TextAlign.Center,
                 )
 
                 Spacer(modifier = Modifier.height(12.dp))
 
                 Text(
-                        text =
-                                "Ascently needs notification permission to show your active climbing session. This helps you track your progress and ensures the session doesn't get interrupted.",
-                        style = MaterialTheme.typography.bodyMedium,
-                        textAlign = TextAlign.Center,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                    text =
+                    "Ascently needs notification permission to show your active climbing session. This helps you track your progress and ensures the session doesn't get interrupted.",
+                    style = MaterialTheme.typography.bodyMedium,
+                    textAlign = TextAlign.Center,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
                 )
 
                 Spacer(modifier = Modifier.height(24.dp))
 
                 Row(
-                        modifier = Modifier.fillMaxWidth(),
-                        horizontalArrangement = Arrangement.spacedBy(12.dp)
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.spacedBy(12.dp),
                 ) {
                     TextButton(onClick = onDismiss, modifier = Modifier.weight(1f)) {
                         Text("Not Now")
                     }
 
                     Button(
-                            onClick = {
-                                onRequestPermission()
-                                onDismiss()
-                            },
-                            modifier = Modifier.weight(1f)
+                        onClick = {
+                            onRequestPermission()
+                            onDismiss()
+                        },
+                        modifier = Modifier.weight(1f),
                     ) { Text("Enable") }
                 }
             }

android/app/src/main/java/com/atridad/ascently/ui/components/OrientationAwareImage.kt

@@ -16,39 +16,39 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
 import androidx.exifinterface.media.ExifInterface
 import com.atridad.ascently.utils.ImageUtils
-import java.io.File
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import java.io.File
 
 @Composable
 fun OrientationAwareImage(
-        imagePath: String,
-        modifier: Modifier = Modifier,
-        contentDescription: String? = null,
-        contentScale: ContentScale = ContentScale.Fit
+    imagePath: String,
+    modifier: Modifier = Modifier,
+    contentDescription: String? = null,
+    contentScale: ContentScale = ContentScale.Fit,
 ) {
     val context = LocalContext.current
     var imageBitmap by
-            remember(imagePath) { mutableStateOf<androidx.compose.ui.graphics.ImageBitmap?>(null) }
+        remember(imagePath) { mutableStateOf<androidx.compose.ui.graphics.ImageBitmap?>(null) }
     var isLoading by remember(imagePath) { mutableStateOf(true) }
 
     LaunchedEffect(imagePath) {
         isLoading = true
         val bitmap =
-                withContext(Dispatchers.IO) {
-                    try {
-                        val imageFile = ImageUtils.getImageFile(context, imagePath)
-                        if (!imageFile.exists()) return@withContext null
+            withContext(Dispatchers.IO) {
+                try {
+                    val imageFile = ImageUtils.getImageFile(context, imagePath)
+                    if (!imageFile.exists()) return@withContext null
 
-                        val originalBitmap =
-                                BitmapFactory.decodeFile(imageFile.absolutePath)
-                                        ?: return@withContext null
-                        val correctedBitmap = correctImageOrientation(imageFile, originalBitmap)
-                        correctedBitmap.asImageBitmap()
-                    } catch (_: Exception) {
-                        null
-                    }
+                    val originalBitmap =
+                        BitmapFactory.decodeFile(imageFile.absolutePath)
+                            ?: return@withContext null
+                    val correctedBitmap = correctImageOrientation(imageFile, originalBitmap)
+                    correctedBitmap.asImageBitmap()
+                } catch (_: Exception) {
+                    null
                 }
+            }
         imageBitmap = bitmap
         isLoading = false
     }
@@ -59,10 +59,10 @@ fun OrientationAwareImage(
         } else {
             imageBitmap?.let { bitmap ->
                 Image(
-                        bitmap = bitmap,
-                        contentDescription = contentDescription,
-                        modifier = Modifier.fillMaxSize(),
-                        contentScale = contentScale
+                    bitmap = bitmap,
+                    contentDescription = contentDescription,
+                    modifier = Modifier.fillMaxSize(),
+                    contentScale = contentScale,
                 )
             }
         }
@@ -70,16 +70,16 @@ fun OrientationAwareImage(
 }
 
 private fun correctImageOrientation(
-        imageFile: File,
-        bitmap: android.graphics.Bitmap
+    imageFile: File,
+    bitmap: android.graphics.Bitmap,
 ): android.graphics.Bitmap {
     return try {
         val exif = ExifInterface(imageFile.absolutePath)
         val orientation =
-                exif.getAttributeInt(
-                        ExifInterface.TAG_ORIENTATION,
-                        ExifInterface.ORIENTATION_NORMAL
-                )
+            exif.getAttributeInt(
+                ExifInterface.TAG_ORIENTATION,
+                ExifInterface.ORIENTATION_NORMAL,
+            )
 
         val matrix = Matrix()
         var needsTransform = false
@@ -124,15 +124,15 @@ private fun correctImageOrientation(
             bitmap
         } else {
             val rotatedBitmap =
-                    android.graphics.Bitmap.createBitmap(
-                            bitmap,
-                            0,
-                            0,
-                            bitmap.width,
-                            bitmap.height,
-                            matrix,
-                            true
-                    )
+                android.graphics.Bitmap.createBitmap(
+                    bitmap,
+                    0,
+                    0,
+                    bitmap.width,
+                    bitmap.height,
+                    matrix,
+                    true,
+                )
             if (rotatedBitmap != bitmap) {
                 bitmap.recycle()
             }

android/app/src/main/java/com/atridad/ascently/ui/components/SyncIndicator.kt

@@ -26,23 +26,23 @@ fun SyncIndicator(isSyncing: StateFlow<Boolean>, modifier: Modifier = Modifier)
     val syncing by isSyncing.collectAsState()
 
     AnimatedVisibility(
-            visible = syncing,
-            enter = scaleIn() + fadeIn(),
-            exit = scaleOut() + fadeOut(),
-            modifier = modifier
+        visible = syncing,
+        enter = scaleIn() + fadeIn(),
+        exit = scaleOut() + fadeOut(),
+        modifier = modifier,
     ) {
         Box(
-                modifier =
-                        Modifier.size(28.dp)
-                                .clip(CircleShape)
-                                .background(MaterialTheme.colorScheme.primaryContainer, CircleShape)
-                                .padding(6.dp),
-                contentAlignment = Alignment.Center
+            modifier =
+            Modifier.size(28.dp)
+                .clip(CircleShape)
+                .background(MaterialTheme.colorScheme.primaryContainer, CircleShape)
+                .padding(6.dp),
+            contentAlignment = Alignment.Center,
         ) {
             CircularProgressIndicator(
-                    modifier = Modifier.size(16.dp),
-                    strokeWidth = 2.dp,
-                    color = MaterialTheme.colorScheme.primary
+                modifier = Modifier.size(16.dp),
+                strokeWidth = 2.dp,
+                color = MaterialTheme.colorScheme.primary,
             )
         }
     }

android/app/src/main/java/com/atridad/ascently/ui/health/HealthConnectCard.kt

@@ -36,19 +36,19 @@ fun HealthConnectCard(modifier: Modifier = Modifier) {
 
     // Permission launcher
     val permissionLauncher =
-            rememberLauncherForActivityResult(
-                    contract = healthConnectManager.getPermissionRequestContract()
-            ) { _ ->
-                coroutineScope.launch {
-                    val allGranted = healthConnectManager.hasAllPermissions()
-                    if (!allGranted) {
-                        errorMessage =
-                                "Some Health Connect permissions were not granted. Please grant all permissions to enable syncing."
-                    } else {
-                        errorMessage = null
-                    }
+        rememberLauncherForActivityResult(
+            contract = healthConnectManager.getPermissionRequestContract(),
+        ) { _ ->
+            coroutineScope.launch {
+                val allGranted = healthConnectManager.hasAllPermissions()
+                if (!allGranted) {
+                    errorMessage =
+                        "Some Health Connect permissions were not granted. Please grant all permissions to enable syncing."
+                } else {
+                    errorMessage = null
                 }
             }
+        }
 
     // Check Health Connect availability on first load
     LaunchedEffect(Unit) {
@@ -62,7 +62,7 @@ fun HealthConnectCard(modifier: Modifier = Modifier) {
                         errorMessage = "Health Connect is not available on this device"
                     } else if (!isCompatible) {
                         errorMessage =
-                                "Health Connect API compatibility issue. Please update your device or the app."
+                            "Health Connect API compatibility issue. Please update your device or the app."
                     }
                 }
             } catch (e: Exception) {
@@ -73,32 +73,32 @@ fun HealthConnectCard(modifier: Modifier = Modifier) {
     }
 
     Card(
-            modifier = modifier.fillMaxWidth(),
-            shape = RoundedCornerShape(16.dp),
-            colors =
-                    CardDefaults.cardColors(
-                            containerColor = MaterialTheme.colorScheme.surfaceVariant
-                    )
+        modifier = modifier.fillMaxWidth(),
+        shape = RoundedCornerShape(16.dp),
+        colors =
+        CardDefaults.cardColors(
+            containerColor = MaterialTheme.colorScheme.surfaceVariant,
+        ),
     ) {
         Column(
-                modifier = Modifier.fillMaxWidth().padding(20.dp),
-                horizontalAlignment = Alignment.CenterHorizontally
+            modifier = Modifier.fillMaxWidth().padding(20.dp),
+            horizontalAlignment = Alignment.CenterHorizontally,
         ) {
             // Header with icon and title
             Row(
                 modifier = Modifier.fillMaxWidth(),
-                verticalAlignment = Alignment.CenterVertically
+                verticalAlignment = Alignment.CenterVertically,
             ) {
                 Icon(
                     imageVector = Icons.Default.HealthAndSafety,
                     contentDescription = null,
                     modifier = Modifier.size(32.dp),
                     tint =
-                        if (isHealthConnectAvailable && isEnabled && hasPermissions) {
-                            MaterialTheme.colorScheme.primary
-                        } else {
-                            MaterialTheme.colorScheme.onSurfaceVariant
-                        }
+                    if (isHealthConnectAvailable && isEnabled && hasPermissions) {
+                        MaterialTheme.colorScheme.primary
+                    } else {
+                        MaterialTheme.colorScheme.onSurfaceVariant
+                    },
                 )
 
                 Spacer(modifier = Modifier.width(12.dp))
@@ -108,40 +108,40 @@ fun HealthConnectCard(modifier: Modifier = Modifier) {
                         text = "Health Connect",
                         style = MaterialTheme.typography.titleMedium,
                         fontWeight = FontWeight.Bold,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
                     )
 
                     Text(
                         text =
-                            when {
-                                isLoading -> "Checking availability..."
-                                !isCompatible -> "API Issue"
-                                !isHealthConnectAvailable -> "Not available"
-                                isEnabled && hasPermissions -> "Connected"
-                                isEnabled && !hasPermissions -> "Needs permissions"
-                                else -> "Disabled"
-                            },
+                        when {
+                            isLoading -> "Checking availability..."
+                            !isCompatible -> "API Issue"
+                            !isHealthConnectAvailable -> "Not available"
+                            isEnabled && hasPermissions -> "Connected"
+                            isEnabled && !hasPermissions -> "Needs permissions"
+                            else -> "Disabled"
+                        },
                         style = MaterialTheme.typography.bodySmall,
                         color =
-                            when {
-                                isLoading ->
-                                    MaterialTheme.colorScheme.onSurfaceVariant.copy(
-                                        alpha = 0.7f
-                                    )
+                        when {
+                            isLoading ->
+                                MaterialTheme.colorScheme.onSurfaceVariant.copy(
+                                    alpha = 0.7f,
+                                )
 
-                                !isCompatible -> MaterialTheme.colorScheme.error
-                                !isHealthConnectAvailable -> MaterialTheme.colorScheme.error
-                                isEnabled && hasPermissions ->
-                                    MaterialTheme.colorScheme.primary
+                            !isCompatible -> MaterialTheme.colorScheme.error
+                            !isHealthConnectAvailable -> MaterialTheme.colorScheme.error
+                            isEnabled && hasPermissions ->
+                                MaterialTheme.colorScheme.primary
 
-                                isEnabled && !hasPermissions ->
-                                    MaterialTheme.colorScheme.tertiary
+                            isEnabled && !hasPermissions ->
+                                MaterialTheme.colorScheme.tertiary
 
-                                else ->
-                                    MaterialTheme.colorScheme.onSurfaceVariant.copy(
-                                        alpha = 0.7f
-                                    )
-                            }
+                            else ->
+                                MaterialTheme.colorScheme.onSurfaceVariant.copy(
+                                    alpha = 0.7f,
+                                )
+                        },
                     )
                 }
 
@@ -167,7 +167,7 @@ fun HealthConnectCard(modifier: Modifier = Modifier) {
                             }
                         }
                     },
-                    enabled = isHealthConnectAvailable && !isLoading && isCompatible
+                    enabled = isHealthConnectAvailable && !isLoading && isCompatible,
                 )
             }
 
@@ -179,7 +179,7 @@ fun HealthConnectCard(modifier: Modifier = Modifier) {
                     style = MaterialTheme.typography.bodyMedium,
                     color = MaterialTheme.colorScheme.onSurfaceVariant,
                     textAlign = TextAlign.Center,
-                    modifier = Modifier.fillMaxWidth()
+                    modifier = Modifier.fillMaxWidth(),
                 )
 
                 if (!hasPermissions) {
@@ -187,12 +187,12 @@ fun HealthConnectCard(modifier: Modifier = Modifier) {
                     Card(
                         shape = RoundedCornerShape(12.dp),
                         colors =
-                            CardDefaults.cardColors(
-                                containerColor =
-                                    MaterialTheme.colorScheme.errorContainer.copy(
-                                        alpha = 0.3f
-                                    )
-                            )
+                        CardDefaults.cardColors(
+                            containerColor =
+                            MaterialTheme.colorScheme.errorContainer.copy(
+                                alpha = 0.3f,
+                            ),
+                        ),
                     ) {
                         Column(modifier = Modifier.fillMaxWidth().padding(16.dp)) {
                             Row(verticalAlignment = Alignment.CenterVertically) {
@@ -200,7 +200,7 @@ fun HealthConnectCard(modifier: Modifier = Modifier) {
                                     imageVector = Icons.Default.Warning,
                                     contentDescription = null,
                                     modifier = Modifier.size(20.dp),
-                                    tint = MaterialTheme.colorScheme.error
+                                    tint = MaterialTheme.colorScheme.error,
                                 )
 
                                 Spacer(modifier = Modifier.width(8.dp))
@@ -209,7 +209,7 @@ fun HealthConnectCard(modifier: Modifier = Modifier) {
                                     text = "Permissions needed",
                                     style = MaterialTheme.typography.bodyMedium,
                                     fontWeight = FontWeight.Medium,
-                                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                                    color = MaterialTheme.colorScheme.onSurfaceVariant,
                                 )
                             }
 
@@ -217,12 +217,12 @@ fun HealthConnectCard(modifier: Modifier = Modifier) {
 
                             Text(
                                 text =
-                                    "Grant Health Connect permissions to sync your climbing sessions",
+                                "Grant Health Connect permissions to sync your climbing sessions",
                                 style = MaterialTheme.typography.bodySmall,
                                 color =
-                                    MaterialTheme.colorScheme.onSurfaceVariant.copy(
-                                        alpha = 0.8f
-                                    )
+                                MaterialTheme.colorScheme.onSurfaceVariant.copy(
+                                    alpha = 0.8f,
+                                ),
                             )
 
                             Spacer(modifier = Modifier.height(8.dp))
@@ -243,7 +243,7 @@ fun HealthConnectCard(modifier: Modifier = Modifier) {
                                         }
                                     }
                                 },
-                                modifier = Modifier.fillMaxWidth()
+                                modifier = Modifier.fillMaxWidth(),
                             ) { Text("Grant Permissions") }
                         }
                     }
@@ -251,10 +251,10 @@ fun HealthConnectCard(modifier: Modifier = Modifier) {
                     Spacer(modifier = Modifier.height(16.dp))
                     Text(
                         text =
-                            "Sync your climbing sessions to Samsung Health, Google Fit, and other fitness apps through Health Connect.",
+                        "Sync your climbing sessions to Samsung Health, Google Fit, and other fitness apps through Health Connect.",
                         style = MaterialTheme.typography.bodyMedium,
                         textAlign = TextAlign.Center,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.8f)
+                        color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.8f),
                     )
                 }
                 errorMessage?.let { error ->
@@ -263,22 +263,22 @@ fun HealthConnectCard(modifier: Modifier = Modifier) {
                     Card(
                         shape = RoundedCornerShape(8.dp),
                         colors =
-                            CardDefaults.cardColors(
-                                containerColor =
-                                    MaterialTheme.colorScheme.errorContainer.copy(
-                                        alpha = 0.5f
-                                    )
-                            )
+                        CardDefaults.cardColors(
+                            containerColor =
+                            MaterialTheme.colorScheme.errorContainer.copy(
+                                alpha = 0.5f,
+                            ),
+                        ),
                     ) {
                         Row(
                             modifier = Modifier.fillMaxWidth().padding(12.dp),
-                            verticalAlignment = Alignment.CenterVertically
+                            verticalAlignment = Alignment.CenterVertically,
                         ) {
                             Icon(
                                 imageVector = Icons.Default.Warning,
                                 contentDescription = null,
                                 modifier = Modifier.size(16.dp),
-                                tint = MaterialTheme.colorScheme.error
+                                tint = MaterialTheme.colorScheme.error,
                             )
 
                             Spacer(modifier = Modifier.width(8.dp))
@@ -286,7 +286,7 @@ fun HealthConnectCard(modifier: Modifier = Modifier) {
                             Text(
                                 text = error,
                                 style = MaterialTheme.typography.bodySmall,
-                                color = MaterialTheme.colorScheme.onErrorContainer
+                                color = MaterialTheme.colorScheme.onErrorContainer,
                             )
                         }
                     }

android/app/src/main/java/com/atridad/ascently/ui/screens/AnalyticsScreen.kt

@@ -27,27 +27,37 @@ fun AnalyticsScreen(viewModel: ClimbViewModel) {
     val attempts by viewModel.attempts.collectAsState()
     val gyms by viewModel.gyms.collectAsState()
 
+    val gradeDistributionData = remember(sessions, problems, attempts) {
+        calculateGradeDistribution(sessions, problems, attempts)
+    }
+
+    val favoriteGym = remember(sessions, gyms) {
+        sessions.groupBy { it.gymId }.maxByOrNull { it.value.size }?.let { (gymId, sessionList) ->
+            gyms.find { it.id == gymId }?.name to sessionList.size
+        }
+    }
+
     LazyColumn(
-            modifier = Modifier.fillMaxSize().padding(16.dp),
-            verticalArrangement = Arrangement.spacedBy(16.dp)
+        modifier = Modifier.fillMaxSize().padding(16.dp),
+        verticalArrangement = Arrangement.spacedBy(16.dp),
     ) {
         item {
             Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.spacedBy(12.dp)
+                modifier = Modifier.fillMaxWidth(),
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.spacedBy(12.dp),
             ) {
                 Icon(
-                        painter = painterResource(id = R.drawable.ic_mountains),
-                        contentDescription = "Ascently Logo",
-                        modifier = Modifier.size(32.dp),
-                        tint = MaterialTheme.colorScheme.primary
+                    painter = painterResource(id = R.drawable.ic_mountains),
+                    contentDescription = "Ascently Logo",
+                    modifier = Modifier.size(32.dp),
+                    tint = MaterialTheme.colorScheme.primary,
                 )
                 Text(
-                        text = "Analytics",
-                        style = MaterialTheme.typography.headlineMedium,
-                        fontWeight = FontWeight.Bold,
-                        modifier = Modifier.weight(1f)
+                    text = "Analytics",
+                    style = MaterialTheme.typography.headlineMedium,
+                    fontWeight = FontWeight.Bold,
+                    modifier = Modifier.weight(1f),
                 )
                 SyncIndicator(isSyncing = viewModel.syncService.isSyncing)
             }
@@ -56,30 +66,23 @@ fun AnalyticsScreen(viewModel: ClimbViewModel) {
         // Overall Stats
         item {
             OverallStatsCard(
-                    totalSessions = sessions.size,
-                    totalProblems = problems.size,
-                    totalAttempts = attempts.size,
-                    totalGyms = gyms.size
+                totalSessions = sessions.size,
+                totalProblems = problems.size,
+                totalAttempts = attempts.size,
+                totalGyms = gyms.size,
             )
         }
 
         // Grade Distribution Chart
         item {
-            val gradeDistributionData = calculateGradeDistribution(sessions, problems, attempts)
             GradeDistributionChartCard(gradeDistributionData = gradeDistributionData)
         }
 
         // Favorite Gym
         item {
-            val favoriteGym =
-                    sessions.groupBy { it.gymId }.maxByOrNull { it.value.size }?.let {
-                            (gymId, sessions) ->
-                        gyms.find { it.id == gymId }?.name to sessions.size
-                    }
-
             FavoriteGymCard(
-                    gymName = favoriteGym?.first ?: "No sessions yet",
-                    sessionCount = favoriteGym?.second ?: 0
+                gymName = favoriteGym?.first ?: "No sessions yet",
+                sessionCount = favoriteGym?.second ?: 0,
             )
         }
 
@@ -96,16 +99,16 @@ fun OverallStatsCard(totalSessions: Int, totalProblems: Int, totalAttempts: Int,
     Card(modifier = Modifier.fillMaxWidth()) {
         Column(modifier = Modifier.fillMaxWidth().padding(16.dp)) {
             Text(
-                    text = "Overall Stats",
-                    style = MaterialTheme.typography.titleMedium,
-                    fontWeight = FontWeight.Bold
+                text = "Overall Stats",
+                style = MaterialTheme.typography.titleMedium,
+                fontWeight = FontWeight.Bold,
             )
 
             Spacer(modifier = Modifier.height(12.dp))
 
             Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.SpaceEvenly
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.SpaceEvenly,
             ) {
                 StatItem(label = "Sessions", value = totalSessions.toString())
                 StatItem(label = "Problems", value = totalProblems.toString())
@@ -121,113 +124,113 @@ fun OverallStatsCard(totalSessions: Int, totalProblems: Int, totalAttempts: Int,
 fun GradeDistributionChartCard(gradeDistributionData: List<GradeDistributionDataPoint>) {
     // Find all grading systems that have been used in the data
     val usedSystems =
-            remember(gradeDistributionData) {
-                gradeDistributionData.map { it.difficultySystem }.distinct()
-            }
+        remember(gradeDistributionData) {
+            gradeDistributionData.map { it.difficultySystem }.distinct()
+        }
 
     var selectedSystem by
-            remember(usedSystems) {
-                mutableStateOf(usedSystems.firstOrNull() ?: DifficultySystem.V_SCALE)
-            }
+        remember(usedSystems) {
+            mutableStateOf(usedSystems.firstOrNull() ?: DifficultySystem.V_SCALE)
+        }
     var expanded by remember { mutableStateOf(false) }
     var showAllTime by remember { mutableStateOf(true) }
 
     Card(modifier = Modifier.fillMaxWidth()) {
         Column(modifier = Modifier.fillMaxWidth().padding(16.dp)) {
             Text(
-                    text = "Grade Distribution",
-                    style = MaterialTheme.typography.titleMedium,
-                    fontWeight = FontWeight.Bold
+                text = "Grade Distribution",
+                style = MaterialTheme.typography.titleMedium,
+                fontWeight = FontWeight.Bold,
             )
 
             Spacer(modifier = Modifier.height(12.dp))
 
             // Toggles section
             Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.SpaceBetween,
-                    verticalAlignment = Alignment.CenterVertically
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.SpaceBetween,
+                verticalAlignment = Alignment.CenterVertically,
             ) {
                 // Time period toggle
                 Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
                     // All Time button
                     FilterChip(
-                            onClick = { showAllTime = true },
-                            label = {
-                                Text("All Time", style = MaterialTheme.typography.bodySmall)
-                            },
-                            selected = showAllTime,
-                            colors =
-                                    FilterChipDefaults.filterChipColors(
-                                            selectedContainerColor =
-                                                    MaterialTheme.colorScheme.primary,
-                                            selectedLabelColor = MaterialTheme.colorScheme.onPrimary
-                                    )
+                        onClick = { showAllTime = true },
+                        label = {
+                            Text("All Time", style = MaterialTheme.typography.bodySmall)
+                        },
+                        selected = showAllTime,
+                        colors =
+                        FilterChipDefaults.filterChipColors(
+                            selectedContainerColor =
+                            MaterialTheme.colorScheme.primary,
+                            selectedLabelColor = MaterialTheme.colorScheme.onPrimary,
+                        ),
                     )
 
                     // 7 Days button
                     FilterChip(
-                            onClick = { showAllTime = false },
-                            label = { Text("7 Days", style = MaterialTheme.typography.bodySmall) },
-                            selected = !showAllTime,
-                            colors =
-                                    FilterChipDefaults.filterChipColors(
-                                            selectedContainerColor =
-                                                    MaterialTheme.colorScheme.primary,
-                                            selectedLabelColor = MaterialTheme.colorScheme.onPrimary
-                                    )
+                        onClick = { showAllTime = false },
+                        label = { Text("7 Days", style = MaterialTheme.typography.bodySmall) },
+                        selected = !showAllTime,
+                        colors =
+                        FilterChipDefaults.filterChipColors(
+                            selectedContainerColor =
+                            MaterialTheme.colorScheme.primary,
+                            selectedLabelColor = MaterialTheme.colorScheme.onPrimary,
+                        ),
                     )
                 }
 
                 // Scale selector dropdown
                 if (usedSystems.size > 1) {
                     ExposedDropdownMenuBox(
-                            expanded = expanded,
-                            onExpandedChange = { expanded = !expanded }
+                        expanded = expanded,
+                        onExpandedChange = { expanded = !expanded },
                     ) {
                         OutlinedTextField(
-                                value =
-                                        when (selectedSystem) {
-                                            DifficultySystem.V_SCALE -> "V-Scale"
-                                            DifficultySystem.FONT -> "Font"
-                                            DifficultySystem.YDS -> "YDS"
-                                            DifficultySystem.CUSTOM -> "Custom"
-                                        },
-                                onValueChange = {},
-                                readOnly = true,
-                                trailingIcon = {
-                                    ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded)
-                                },
-                                modifier =
-                                        Modifier.menuAnchor(
-                                                        type =
-                                                                ExposedDropdownMenuAnchorType
-                                                                        .PrimaryNotEditable,
-                                                        enabled = true
-                                                )
-                                                .width(120.dp),
-                                textStyle = MaterialTheme.typography.bodyMedium
+                            value =
+                            when (selectedSystem) {
+                                DifficultySystem.V_SCALE -> "V-Scale"
+                                DifficultySystem.FONT -> "Font"
+                                DifficultySystem.YDS -> "YDS"
+                                DifficultySystem.CUSTOM -> "Custom"
+                            },
+                            onValueChange = {},
+                            readOnly = true,
+                            trailingIcon = {
+                                ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded)
+                            },
+                            modifier =
+                            Modifier.menuAnchor(
+                                type =
+                                ExposedDropdownMenuAnchorType
+                                    .PrimaryNotEditable,
+                                enabled = true,
+                            )
+                                .width(120.dp),
+                            textStyle = MaterialTheme.typography.bodyMedium,
                         )
                         ExposedDropdownMenu(
-                                expanded = expanded,
-                                onDismissRequest = { expanded = false }
+                            expanded = expanded,
+                            onDismissRequest = { expanded = false },
                         ) {
                             usedSystems.forEach { system ->
                                 DropdownMenuItem(
-                                        text = {
-                                            Text(
-                                                    when (system) {
-                                                        DifficultySystem.V_SCALE -> "V-Scale"
-                                                        DifficultySystem.FONT -> "Font"
-                                                        DifficultySystem.YDS -> "YDS"
-                                                        DifficultySystem.CUSTOM -> "Custom"
-                                                    }
-                                            )
-                                        },
-                                        onClick = {
-                                            selectedSystem = system
-                                            expanded = false
-                                        }
+                                    text = {
+                                        Text(
+                                            when (system) {
+                                                DifficultySystem.V_SCALE -> "V-Scale"
+                                                DifficultySystem.FONT -> "Font"
+                                                DifficultySystem.YDS -> "YDS"
+                                                DifficultySystem.CUSTOM -> "Custom"
+                                            },
+                                        )
+                                    },
+                                    onClick = {
+                                        selectedSystem = system
+                                        expanded = false
+                                    },
                                 )
                             }
                         }
@@ -239,89 +242,91 @@ fun GradeDistributionChartCard(gradeDistributionData: List<GradeDistributionData
 
             // Filter grade distribution data by selected scale and time period
             val filteredGradeData =
-                    remember(gradeDistributionData, selectedSystem, showAllTime) {
-                        val systemFiltered =
-                                gradeDistributionData.filter {
-                                    it.difficultySystem == selectedSystem
-                                }
+                remember(gradeDistributionData, selectedSystem, showAllTime) {
+                    val systemFiltered =
+                        gradeDistributionData.filter {
+                            it.difficultySystem == selectedSystem
+                        }
 
-                        if (showAllTime) {
-                            systemFiltered
-                        } else {
-                            // Filter for last 7 days
-                            val sevenDaysAgo = LocalDateTime.now().minusDays(7)
-                            systemFiltered.filter { dataPoint ->
-                                try {
-                                    val attemptDate =
-                                            DateFormatUtils.parseToLocalDateTime(dataPoint.date)
-                                    attemptDate?.isAfter(sevenDaysAgo) == true
-                                } catch (_: Exception) {
-                                    // If date parsing fails, include the data point
-                                    true
-                                }
+                    if (showAllTime) {
+                        systemFiltered
+                    } else {
+                        // Filter for last 7 days
+                        val sevenDaysAgo = LocalDateTime.now().minusDays(7)
+                        systemFiltered.filter { dataPoint ->
+                            try {
+                                val attemptDate =
+                                    DateFormatUtils.parseToLocalDateTime(dataPoint.date)
+                                attemptDate?.isAfter(sevenDaysAgo) == true
+                            } catch (_: Exception) {
+                                // If date parsing fails, include the data point
+                                true
                             }
                         }
                     }
+                }
 
             if (filteredGradeData.isNotEmpty()) {
                 // Group by grade and sum counts
                 val gradeGroups =
-                        filteredGradeData
-                                .groupBy { it.grade }
-                                .mapValues { (_, dataPoints) -> dataPoints.sumOf { it.count } }
-                                .map { (grade, count) ->
-                                    val firstDataPoint =
-                                            filteredGradeData.first { it.grade == grade }
-                                    BarChartDataPoint(
-                                            label = grade,
-                                            value = count,
-                                            gradeNumeric = firstDataPoint.gradeNumeric
-                                    )
-                                }
+                    filteredGradeData
+                        .groupBy { it.grade }
+                        .mapValues { (_, dataPoints) -> dataPoints.sumOf { it.count } }
+                        .map { (grade, count) ->
+                            val firstDataPoint =
+                                filteredGradeData.first { it.grade == grade }
+                            BarChartDataPoint(
+                                label = grade,
+                                value = count,
+                                gradeNumeric = firstDataPoint.gradeNumeric,
+                            )
+                        }
 
                 BarChart(data = gradeGroups, modifier = Modifier.fillMaxWidth().height(220.dp))
 
                 Spacer(modifier = Modifier.height(8.dp))
 
                 Text(
-                        text =
-                                "Successful climbs by ${when(selectedSystem) {
+                    text =
+                    "Successful climbs by ${when (selectedSystem) {
                         DifficultySystem.V_SCALE -> "V-grade"
                         DifficultySystem.FONT -> "Font grade"
                         DifficultySystem.YDS -> "YDS grade"
                         DifficultySystem.CUSTOM -> "custom grade"
                     }}",
-                        style = MaterialTheme.typography.bodySmall,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                    style = MaterialTheme.typography.bodySmall,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
                 )
             } else {
                 Column(
-                        modifier = Modifier.fillMaxWidth().height(220.dp),
-                        horizontalAlignment = Alignment.CenterHorizontally,
-                        verticalArrangement = Arrangement.Center
+                    modifier = Modifier.fillMaxWidth().height(220.dp),
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                    verticalArrangement = Arrangement.Center,
                 ) {
                     Icon(
-                            painter = painterResource(id = R.drawable.ic_mountains),
-                            contentDescription = "No data",
-                            modifier = Modifier.size(48.dp),
-                            tint = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f)
+                        painter = painterResource(id = R.drawable.ic_mountains),
+                        contentDescription = "No data",
+                        modifier = Modifier.size(48.dp),
+                        tint = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f),
                     )
 
                     Spacer(modifier = Modifier.height(8.dp))
 
                     Text(
-                            text = "No data available.",
-                            style = MaterialTheme.typography.bodyMedium,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant
+                        text = "No data available.",
+                        style = MaterialTheme.typography.bodyMedium,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
                     )
 
                     Text(
-                            text =
-                                    if (showAllTime)
-                                            "Complete some climbs to see your grade distribution!"
-                                    else "No climbs in the last 7 days",
-                            style = MaterialTheme.typography.bodySmall,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f)
+                        text =
+                        if (showAllTime) {
+                            "Complete some climbs to see your grade distribution!"
+                        } else {
+                            "No climbs in the last 7 days"
+                        },
+                        style = MaterialTheme.typography.bodySmall,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f),
                     )
                 }
             }
@@ -334,24 +339,24 @@ fun FavoriteGymCard(gymName: String, sessionCount: Int) {
     Card(modifier = Modifier.fillMaxWidth()) {
         Column(modifier = Modifier.fillMaxWidth().padding(16.dp)) {
             Text(
-                    text = "Favorite Gym",
-                    style = MaterialTheme.typography.titleMedium,
-                    fontWeight = FontWeight.Bold
+                text = "Favorite Gym",
+                style = MaterialTheme.typography.titleMedium,
+                fontWeight = FontWeight.Bold,
             )
 
             Spacer(modifier = Modifier.height(8.dp))
 
             Text(
-                    text = gymName,
-                    style = MaterialTheme.typography.titleLarge,
-                    fontWeight = FontWeight.Medium
+                text = gymName,
+                style = MaterialTheme.typography.titleLarge,
+                fontWeight = FontWeight.Medium,
             )
 
             if (sessionCount > 0) {
                 Text(
-                        text = "$sessionCount sessions",
-                        style = MaterialTheme.typography.bodyMedium,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                    text = "$sessionCount sessions",
+                    style = MaterialTheme.typography.bodyMedium,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
                 )
             }
         }
@@ -363,39 +368,39 @@ fun RecentActivityCard(recentSessions: Int) {
     Card(modifier = Modifier.fillMaxWidth()) {
         Column(modifier = Modifier.fillMaxWidth().padding(16.dp)) {
             Text(
-                    text = "Recent Activity",
-                    style = MaterialTheme.typography.titleMedium,
-                    fontWeight = FontWeight.Bold
+                text = "Recent Activity",
+                style = MaterialTheme.typography.titleMedium,
+                fontWeight = FontWeight.Bold,
             )
 
             Spacer(modifier = Modifier.height(8.dp))
 
             Text(
-                    text =
-                            if (recentSessions > 0) {
-                                "You've had $recentSessions recent sessions"
-                            } else {
-                                "No recent activity"
-                            },
-                    style = MaterialTheme.typography.bodyMedium
+                text =
+                if (recentSessions > 0) {
+                    "You've had $recentSessions recent sessions"
+                } else {
+                    "No recent activity"
+                },
+                style = MaterialTheme.typography.bodyMedium,
             )
         }
     }
 }
 
 data class GradeDistributionDataPoint(
-        val date: String,
-        val grade: String,
-        val gradeNumeric: Int,
-        val count: Int,
-        val climbType: ClimbType,
-        val difficultySystem: DifficultySystem
+    val date: String,
+    val grade: String,
+    val gradeNumeric: Int,
+    val count: Int,
+    val climbType: ClimbType,
+    val difficultySystem: DifficultySystem,
 )
 
 fun calculateGradeDistribution(
-        sessions: List<com.atridad.ascently.data.model.ClimbSession>,
-        problems: List<com.atridad.ascently.data.model.Problem>,
-        attempts: List<com.atridad.ascently.data.model.Attempt>
+    sessions: List<com.atridad.ascently.data.model.ClimbSession>,
+    problems: List<com.atridad.ascently.data.model.Problem>,
+    attempts: List<com.atridad.ascently.data.model.Attempt>,
 ): List<GradeDistributionDataPoint> {
     if (sessions.isEmpty() || problems.isEmpty() || attempts.isEmpty()) {
         return emptyList()
@@ -403,9 +408,9 @@ fun calculateGradeDistribution(
 
     // Get all successful attempts
     val successfulAttempts =
-            attempts.filter {
-                it.result == AttemptResult.SUCCESS || it.result == AttemptResult.FLASH
-            }
+        attempts.filter {
+            it.result == AttemptResult.SUCCESS || it.result == AttemptResult.FLASH
+        }
 
     if (successfulAttempts.isEmpty()) {
         return emptyList()
@@ -426,18 +431,18 @@ fun calculateGradeDistribution(
                 gradeDistribution[key] = existing.copy(count = existing.count + 1)
             } else {
                 gradeDistribution[key] =
-                        GradeDistributionDataPoint(
-                                date = attempt.timestamp,
-                                grade = problem.difficulty.grade,
-                                gradeNumeric =
-                                        gradeToNumeric(
-                                                problem.difficulty.system,
-                                                problem.difficulty.grade
-                                        ),
-                                count = 1,
-                                climbType = problem.climbType,
-                                difficultySystem = problem.difficulty.system
-                        )
+                    GradeDistributionDataPoint(
+                        date = attempt.timestamp,
+                        grade = problem.difficulty.grade,
+                        gradeNumeric =
+                        gradeToNumeric(
+                            problem.difficulty.system,
+                            problem.difficulty.grade,
+                        ),
+                        count = 1,
+                        climbType = problem.climbType,
+                        difficultySystem = problem.difficulty.system,
+                    )
             }
         }
     }

android/app/src/main/java/com/atridad/ascently/ui/screens/GymsScreen.kt

@@ -22,21 +22,21 @@ fun GymsScreen(viewModel: ClimbViewModel, onNavigateToGymDetail: (String) -> Uni
 
     Column(modifier = Modifier.fillMaxSize().padding(16.dp)) {
         Row(
-                modifier = Modifier.fillMaxWidth(),
-                verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.spacedBy(12.dp)
+            modifier = Modifier.fillMaxWidth(),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(12.dp),
         ) {
             Icon(
-                    painter = painterResource(id = R.drawable.ic_mountains),
-                    contentDescription = "Ascently Logo",
-                    modifier = Modifier.size(32.dp),
-                    tint = MaterialTheme.colorScheme.primary
+                painter = painterResource(id = R.drawable.ic_mountains),
+                contentDescription = "Ascently Logo",
+                modifier = Modifier.size(32.dp),
+                tint = MaterialTheme.colorScheme.primary,
             )
             Text(
-                    text = "Climbing Gyms",
-                    style = MaterialTheme.typography.headlineMedium,
-                    fontWeight = FontWeight.Bold,
-                    modifier = Modifier.weight(1f)
+                text = "Climbing Gyms",
+                style = MaterialTheme.typography.headlineMedium,
+                fontWeight = FontWeight.Bold,
+                modifier = Modifier.weight(1f),
             )
             SyncIndicator(isSyncing = viewModel.syncService.isSyncing)
         }
@@ -45,14 +45,14 @@ fun GymsScreen(viewModel: ClimbViewModel, onNavigateToGymDetail: (String) -> Uni
 
         if (gyms.isEmpty()) {
             EmptyStateMessage(
-                    title = "No Gyms Added",
-                    message = "Add your favorite climbing gyms to start tracking your progress!",
-                    onActionClick = {},
-                    actionText = ""
+                title = "No Gyms Added",
+                message = "Add your favorite climbing gyms to start tracking your progress!",
+                onActionClick = {},
+                actionText = "",
             )
         } else {
             LazyColumn {
-                items(gyms) { gym ->
+                items(gyms, key = { it.id }) { gym ->
                     GymCard(gym = gym, onClick = { onNavigateToGymDetail(gym.id) })
                     Spacer(modifier = Modifier.height(8.dp))
                 }
@@ -67,17 +67,17 @@ fun GymCard(gym: Gym, onClick: () -> Unit) {
     Card(onClick = onClick, modifier = Modifier.fillMaxWidth()) {
         Column(modifier = Modifier.fillMaxWidth().padding(16.dp)) {
             Text(
-                    text = gym.name,
-                    style = MaterialTheme.typography.titleLarge,
-                    fontWeight = FontWeight.Bold
+                text = gym.name,
+                style = MaterialTheme.typography.titleLarge,
+                fontWeight = FontWeight.Bold,
             )
 
             gym.location?.let { location ->
                 Spacer(modifier = Modifier.height(4.dp))
                 Text(
-                        text = location,
-                        style = MaterialTheme.typography.bodyMedium,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                    text = location,
+                    style = MaterialTheme.typography.bodyMedium,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
                 )
             }
 
@@ -86,9 +86,9 @@ fun GymCard(gym: Gym, onClick: () -> Unit) {
             Row {
                 gym.supportedClimbTypes.forEach { climbType ->
                     AssistChip(
-                            onClick = {},
-                            label = { Text(climbType.displayName) },
-                            modifier = Modifier.padding(end = 4.dp)
+                        onClick = {},
+                        label = { Text(climbType.displayName) },
+                        modifier = Modifier.padding(end = 4.dp),
                     )
                 }
             }
@@ -96,10 +96,10 @@ fun GymCard(gym: Gym, onClick: () -> Unit) {
             if (gym.difficultySystems.isNotEmpty()) {
                 Spacer(modifier = Modifier.height(4.dp))
                 Text(
-                        text =
-                                "Systems: ${gym.difficultySystems.joinToString(", ") { it.displayName }}",
-                        style = MaterialTheme.typography.bodySmall,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                    text =
+                    "Systems: ${gym.difficultySystems.joinToString(", ") { it.displayName }}",
+                    style = MaterialTheme.typography.bodySmall,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
                 )
             }
 
@@ -107,10 +107,10 @@ fun GymCard(gym: Gym, onClick: () -> Unit) {
                 if (notes.isNotBlank()) {
                     Spacer(modifier = Modifier.height(8.dp))
                     Text(
-                            text = notes,
-                            style = MaterialTheme.typography.bodySmall,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant,
-                            maxLines = 2
+                        text = notes,
+                        style = MaterialTheme.typography.bodySmall,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                        maxLines = 2,
                     )
                 }
             }

android/app/src/main/java/com/atridad/ascently/ui/screens/ProblemsScreen.kt

@@ -35,35 +35,36 @@ fun ProblemsScreen(viewModel: ClimbViewModel, onNavigateToProblemDetail: (String
     var selectedGym by remember { mutableStateOf<Gym?>(null) }
 
     // Apply filters
-    val filteredProblems =
-            problems.filter { problem ->
-                val climbTypeMatch = selectedClimbType?.let { it == problem.climbType } != false
-                val gymMatch = selectedGym?.let { it.id == problem.gymId } != false
-                climbTypeMatch && gymMatch
-            }
+    val filteredProblems = remember(problems, selectedClimbType, selectedGym) {
+        problems.filter { problem ->
+            val climbTypeMatch = selectedClimbType?.let { it == problem.climbType } != false
+            val gymMatch = selectedGym?.let { it.id == problem.gymId } != false
+            climbTypeMatch && gymMatch
+        }
+    }
 
     // Separate active and inactive problems
-    val activeProblems = filteredProblems.filter { it.isActive }
-    val inactiveProblems = filteredProblems.filter { !it.isActive }
-    val sortedProblems = activeProblems + inactiveProblems
+    val activeProblems = remember(filteredProblems) { filteredProblems.filter { it.isActive } }
+    val inactiveProblems = remember(filteredProblems) { filteredProblems.filter { !it.isActive } }
+    val sortedProblems = remember(activeProblems, inactiveProblems) { activeProblems + inactiveProblems }
 
     Column(modifier = Modifier.fillMaxSize().padding(16.dp)) {
         Row(
-                modifier = Modifier.fillMaxWidth(),
-                verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.spacedBy(12.dp)
+            modifier = Modifier.fillMaxWidth(),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(12.dp),
         ) {
             Icon(
-                    painter = painterResource(id = R.drawable.ic_mountains),
-                    contentDescription = "Ascently Logo",
-                    modifier = Modifier.size(32.dp),
-                    tint = MaterialTheme.colorScheme.primary
+                painter = painterResource(id = R.drawable.ic_mountains),
+                contentDescription = "Ascently Logo",
+                modifier = Modifier.size(32.dp),
+                tint = MaterialTheme.colorScheme.primary,
             )
             Text(
-                    text = "Climbing Problems",
-                    style = MaterialTheme.typography.headlineMedium,
-                    fontWeight = FontWeight.Bold,
-                    modifier = Modifier.weight(1f)
+                text = "Climbing Problems",
+                style = MaterialTheme.typography.headlineMedium,
+                fontWeight = FontWeight.Bold,
+                modifier = Modifier.weight(1f),
             )
             SyncIndicator(isSyncing = viewModel.syncService.isSyncing)
         }
@@ -75,18 +76,18 @@ fun ProblemsScreen(viewModel: ClimbViewModel, onNavigateToProblemDetail: (String
             Card(modifier = Modifier.fillMaxWidth()) {
                 Column(modifier = Modifier.padding(16.dp)) {
                     Text(
-                            text = "Filters",
-                            style = MaterialTheme.typography.titleMedium,
-                            fontWeight = FontWeight.Bold
+                        text = "Filters",
+                        style = MaterialTheme.typography.titleMedium,
+                        fontWeight = FontWeight.Bold,
                     )
 
                     Spacer(modifier = Modifier.height(12.dp))
 
                     // Climb Type Filter
                     Text(
-                            text = "Climb Type",
-                            style = MaterialTheme.typography.bodyMedium,
-                            fontWeight = FontWeight.Medium
+                        text = "Climb Type",
+                        style = MaterialTheme.typography.bodyMedium,
+                        fontWeight = FontWeight.Medium,
                     )
 
                     Spacer(modifier = Modifier.height(8.dp))
@@ -94,16 +95,16 @@ fun ProblemsScreen(viewModel: ClimbViewModel, onNavigateToProblemDetail: (String
                     LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
                         item {
                             FilterChip(
-                                    onClick = { selectedClimbType = null },
-                                    label = { Text("All Types") },
-                                    selected = selectedClimbType == null
+                                onClick = { selectedClimbType = null },
+                                label = { Text("All Types") },
+                                selected = selectedClimbType == null,
                             )
                         }
                         items(ClimbType.entries) { climbType ->
                             FilterChip(
-                                    onClick = { selectedClimbType = climbType },
-                                    label = { Text(climbType.displayName) },
-                                    selected = selectedClimbType == climbType
+                                onClick = { selectedClimbType = climbType },
+                                label = { Text(climbType.displayName) },
+                                selected = selectedClimbType == climbType,
                             )
                         }
                     }
@@ -112,9 +113,9 @@ fun ProblemsScreen(viewModel: ClimbViewModel, onNavigateToProblemDetail: (String
 
                     // Gym Filter
                     Text(
-                            text = "Gym",
-                            style = MaterialTheme.typography.bodyMedium,
-                            fontWeight = FontWeight.Medium
+                        text = "Gym",
+                        style = MaterialTheme.typography.bodyMedium,
+                        fontWeight = FontWeight.Medium,
                     )
 
                     Spacer(modifier = Modifier.height(8.dp))
@@ -122,16 +123,16 @@ fun ProblemsScreen(viewModel: ClimbViewModel, onNavigateToProblemDetail: (String
                     LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
                         item {
                             FilterChip(
-                                    onClick = { selectedGym = null },
-                                    label = { Text("All Gyms") },
-                                    selected = selectedGym == null
+                                onClick = { selectedGym = null },
+                                label = { Text("All Gyms") },
+                                selected = selectedGym == null,
                             )
                         }
                         items(gyms) { gym ->
                             FilterChip(
-                                    onClick = { selectedGym = gym },
-                                    label = { Text(gym.name) },
-                                    selected = selectedGym?.id == gym.id
+                                onClick = { selectedGym = gym },
+                                label = { Text(gym.name) },
+                                selected = selectedGym?.id == gym.id,
                             )
                         }
                     }
@@ -140,10 +141,10 @@ fun ProblemsScreen(viewModel: ClimbViewModel, onNavigateToProblemDetail: (String
                     if (selectedClimbType != null || selectedGym != null) {
                         Spacer(modifier = Modifier.height(12.dp))
                         Text(
-                                text =
-                                        "Showing ${filteredProblems.size} of ${problems.size} problems (${activeProblems.size} active, ${inactiveProblems.size} reset)",
-                                style = MaterialTheme.typography.bodySmall,
-                                color = MaterialTheme.colorScheme.onSurfaceVariant
+                            text =
+                            "Showing ${filteredProblems.size} of ${problems.size} problems (${activeProblems.size} active, ${inactiveProblems.size} reset)",
+                            style = MaterialTheme.typography.bodySmall,
+                            color = MaterialTheme.colorScheme.onSurfaceVariant,
                         )
                     }
                 }
@@ -154,35 +155,37 @@ fun ProblemsScreen(viewModel: ClimbViewModel, onNavigateToProblemDetail: (String
 
         if (filteredProblems.isEmpty()) {
             EmptyStateMessage(
-                    title =
-                            if (problems.isEmpty()) {
-                                if (gyms.isEmpty()) "No Gyms Available" else "No Problems Yet"
-                            } else {
-                                "No Problems Match Filters"
-                            },
-                    message =
-                            if (problems.isEmpty()) {
-                                if (gyms.isEmpty())
-                                        "Add a gym first to start tracking problems and routes!"
-                                else "Start tracking your favorite problems and routes!"
-                            } else {
-                                "Try adjusting your filters to see more problems."
-                            },
-                    onActionClick = {},
-                    actionText = ""
+                title =
+                if (problems.isEmpty()) {
+                    if (gyms.isEmpty()) "No Gyms Available" else "No Problems Yet"
+                } else {
+                    "No Problems Match Filters"
+                },
+                message =
+                if (problems.isEmpty()) {
+                    if (gyms.isEmpty()) {
+                        "Add a gym first to start tracking problems and routes!"
+                    } else {
+                        "Start tracking your favorite problems and routes!"
+                    }
+                } else {
+                    "Try adjusting your filters to see more problems."
+                },
+                onActionClick = {},
+                actionText = "",
             )
         } else {
             LazyColumn {
-                items(sortedProblems) { problem ->
+                    items(sortedProblems, key = { it.id }) { problem ->
                     ProblemCard(
-                            problem = problem,
-                            gymName = gyms.find { it.id == problem.gymId }?.name ?: "Unknown Gym",
-                            attempts = attempts,
-                            onClick = { onNavigateToProblemDetail(problem.id) },
-                            onToggleActive = {
-                                val updatedProblem = problem.copy(isActive = !problem.isActive)
-                                viewModel.updateProblem(updatedProblem)
-                            }
+                        problem = problem,
+                        gymName = gyms.find { it.id == problem.gymId }?.name ?: "Unknown Gym",
+                        attempts = attempts,
+                        onClick = { onNavigateToProblemDetail(problem.id) },
+                        onToggleActive = {
+                            val updatedProblem = problem.copy(isActive = !problem.isActive)
+                            viewModel.updateProblem(updatedProblem)
+                        },
                     )
                     Spacer(modifier = Modifier.height(8.dp))
                 }
@@ -194,81 +197,86 @@ fun ProblemsScreen(viewModel: ClimbViewModel, onNavigateToProblemDetail: (String
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ProblemCard(
-        problem: Problem,
-        gymName: String,
-        attempts: List<Attempt>,
-        onClick: () -> Unit,
-        onToggleActive: (() -> Unit)? = null
+    problem: Problem,
+    gymName: String,
+    attempts: List<Attempt>,
+    onClick: () -> Unit,
+    onToggleActive: (() -> Unit)? = null,
 ) {
     val isCompleted =
-            attempts.any { attempt ->
-                attempt.problemId == problem.id &&
-                        (attempt.result == AttemptResult.SUCCESS ||
-                                attempt.result == AttemptResult.FLASH)
-            }
+        attempts.any { attempt ->
+            attempt.problemId == problem.id &&
+                (
+                    attempt.result == AttemptResult.SUCCESS ||
+                        attempt.result == AttemptResult.FLASH
+                    )
+        }
 
     Card(onClick = onClick, modifier = Modifier.fillMaxWidth()) {
         Column(modifier = Modifier.fillMaxWidth().padding(16.dp)) {
             Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.SpaceBetween,
-                    verticalAlignment = Alignment.Top
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.SpaceBetween,
+                verticalAlignment = Alignment.Top,
             ) {
                 Column(modifier = Modifier.weight(1f)) {
                     Text(
-                            text = problem.name ?: "Unnamed Problem",
-                            style = MaterialTheme.typography.titleMedium,
-                            fontWeight = FontWeight.Bold,
-                            color =
-                                    if (problem.isActive) MaterialTheme.colorScheme.onSurface
-                                    else MaterialTheme.colorScheme.onSurface.copy(alpha = 0.6f)
+                        text = problem.name ?: "Unnamed Problem",
+                        style = MaterialTheme.typography.titleMedium,
+                        fontWeight = FontWeight.Bold,
+                        color =
+                        if (problem.isActive) {
+                            MaterialTheme.colorScheme.onSurface
+                        } else {
+                            MaterialTheme.colorScheme.onSurface.copy(alpha = 0.6f)
+                        },
                     )
 
                     Text(
-                            text = gymName,
-                            style = MaterialTheme.typography.bodyMedium,
-                            color =
-                                    MaterialTheme.colorScheme.onSurfaceVariant.copy(
-                                            alpha = if (problem.isActive) 1f else 0.6f
-                                    )
+                        text = gymName,
+                        style = MaterialTheme.typography.bodyMedium,
+                        color =
+                        MaterialTheme.colorScheme.onSurfaceVariant.copy(
+                            alpha = if (problem.isActive) 1f else 0.6f,
+                        ),
                     )
                 }
 
                 Column(horizontalAlignment = Alignment.End) {
                     Row(
-                            horizontalArrangement = Arrangement.spacedBy(8.dp),
-                            verticalAlignment = Alignment.CenterVertically
+                        horizontalArrangement = Arrangement.spacedBy(8.dp),
+                        verticalAlignment = Alignment.CenterVertically,
                     ) {
                         if (problem.imagePaths.isNotEmpty()) {
                             Icon(
-                                    imageVector = Icons.Default.Image,
-                                    contentDescription = "Has images",
-                                    modifier = Modifier.size(16.dp),
-                                    tint = MaterialTheme.colorScheme.primary
+                                imageVector = Icons.Default.Image,
+                                contentDescription = "Has images",
+                                modifier = Modifier.size(16.dp),
+                                tint = MaterialTheme.colorScheme.primary,
                             )
                         }
 
                         if (isCompleted) {
                             Icon(
-                                    imageVector = Icons.Default.CheckCircle,
-                                    contentDescription = "Completed",
-                                    modifier = Modifier.size(16.dp),
-                                    tint = MaterialTheme.colorScheme.tertiary
+                                imageVector = Icons.Default.CheckCircle,
+                                contentDescription = "Completed",
+                                modifier = Modifier.size(16.dp),
+                                tint = MaterialTheme.colorScheme.tertiary,
                             )
                         }
 
                         Text(
-                                text = problem.difficulty.grade,
-                                style = MaterialTheme.typography.titleMedium,
-                                fontWeight = FontWeight.Bold,
-                                color = MaterialTheme.colorScheme.primary
+                            text = problem.difficulty.grade,
+                            style = MaterialTheme.typography.titleMedium,
+                            fontWeight = FontWeight.Bold,
+                            color = MaterialTheme.colorScheme.primary,
                         )
                     }
 
                     Text(
-                            text = problem.climbType.displayName,
-                            style = MaterialTheme.typography.bodySmall,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant
+                        text = problem.climbType.displayName,
+                        style = MaterialTheme.typography.bodySmall,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
                     )
                 }
             }
@@ -276,9 +284,9 @@ fun ProblemCard(
             problem.location?.let { location ->
                 Spacer(modifier = Modifier.height(4.dp))
                 Text(
-                        text = "Location: $location",
-                        style = MaterialTheme.typography.bodySmall,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                    text = "Location: $location",
+                    style = MaterialTheme.typography.bodySmall,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
                 )
             }
 
@@ -287,9 +295,9 @@ fun ProblemCard(
                 Row {
                     problem.tags.take(3).forEach { tag ->
                         AssistChip(
-                                onClick = {},
-                                label = { Text(tag) },
-                                modifier = Modifier.padding(end = 4.dp)
+                            onClick = {},
+                            label = { Text(tag) },
+                            modifier = Modifier.padding(end = 4.dp),
                         )
                     }
                 }
@@ -298,10 +306,10 @@ fun ProblemCard(
             if (!problem.isActive) {
                 Spacer(modifier = Modifier.height(8.dp))
                 Text(
-                        text = "Reset / No Longer Set",
-                        style = MaterialTheme.typography.bodySmall,
-                        color = MaterialTheme.colorScheme.tertiary,
-                        fontWeight = FontWeight.Medium
+                    text = "Reset / No Longer Set",
+                    style = MaterialTheme.typography.bodySmall,
+                    color = MaterialTheme.colorScheme.tertiary,
+                    fontWeight = FontWeight.Medium,
                 )
             }
 
@@ -309,19 +317,21 @@ fun ProblemCard(
             if (onToggleActive != null) {
                 Spacer(modifier = Modifier.height(8.dp))
                 OutlinedButton(
-                        onClick = onToggleActive,
-                        colors =
-                                ButtonDefaults.outlinedButtonColors(
-                                        contentColor =
-                                                if (problem.isActive)
-                                                        MaterialTheme.colorScheme.tertiary
-                                                else MaterialTheme.colorScheme.primary
-                                ),
-                        modifier = Modifier.fillMaxWidth()
+                    onClick = onToggleActive,
+                    colors =
+                    ButtonDefaults.outlinedButtonColors(
+                        contentColor =
+                        if (problem.isActive) {
+                            MaterialTheme.colorScheme.tertiary
+                        } else {
+                            MaterialTheme.colorScheme.primary
+                        },
+                    ),
+                    modifier = Modifier.fillMaxWidth(),
                 ) {
                     Text(
-                            text = if (problem.isActive) "Mark as Reset" else "Mark as Active",
-                            style = MaterialTheme.typography.bodySmall
+                        text = if (problem.isActive) "Mark as Reset" else "Mark as Active",
+                        style = MaterialTheme.typography.bodySmall,
                     )
                 }
             }

android/app/src/main/java/com/atridad/ascently/ui/screens/SessionsScreen.kt

@@ -24,6 +24,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import androidx.core.content.edit
 import com.atridad.ascently.R
 import com.atridad.ascently.data.model.ClimbSession
 import com.atridad.ascently.data.model.SessionStatus
@@ -36,11 +37,10 @@ import java.time.YearMonth
 import java.time.format.DateTimeFormatter
 import java.time.format.TextStyle
 import java.util.Locale
-import androidx.core.content.edit
 
 enum class ViewMode {
     LIST,
-    CALENDAR
+    CALENDAR,
 }
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -53,7 +53,7 @@ fun SessionsScreen(viewModel: ClimbViewModel, onNavigateToSessionDetail: (String
     val uiState by viewModel.uiState.collectAsState()
 
     val sharedPreferences =
-            context.getSharedPreferences("SessionsPreferences", Context.MODE_PRIVATE)
+        context.getSharedPreferences("SessionsPreferences", Context.MODE_PRIVATE)
     val savedViewMode = sharedPreferences.getString("view_mode", "LIST")
     var viewMode by remember {
         mutableStateOf(if (savedViewMode == "CALENDAR") ViewMode.CALENDAR else ViewMode.LIST)
@@ -61,43 +61,50 @@ fun SessionsScreen(viewModel: ClimbViewModel, onNavigateToSessionDetail: (String
     var selectedMonth by remember { mutableStateOf(YearMonth.now()) }
     var selectedDate by remember { mutableStateOf<LocalDate?>(LocalDate.now()) }
 
-    val completedSessions = sessions.filter { it.status == SessionStatus.COMPLETED }
-    val activeSessionGym = activeSession?.let { session -> gyms.find { it.id == session.gymId } }
+    val completedSessions = remember(sessions) {
+        sessions.filter { it.status == SessionStatus.COMPLETED }
+    }
+    val activeSessionGym = remember(activeSession, gyms) {
+        activeSession?.let { session -> gyms.find { it.id == session.gymId } }
+    }
 
     Column(modifier = Modifier.fillMaxSize().padding(16.dp)) {
         Row(
-                modifier = Modifier.fillMaxWidth(),
-                verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.spacedBy(12.dp)
+            modifier = Modifier.fillMaxWidth(),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(12.dp),
         ) {
             Icon(
-                    painter = painterResource(id = R.drawable.ic_mountains),
-                    contentDescription = "Ascently Logo",
-                    modifier = Modifier.size(32.dp),
-                    tint = MaterialTheme.colorScheme.primary
+                painter = painterResource(id = R.drawable.ic_mountains),
+                contentDescription = "Ascently Logo",
+                modifier = Modifier.size(32.dp),
+                tint = MaterialTheme.colorScheme.primary,
             )
             Text(
-                    text = "Climbing Sessions",
-                    style = MaterialTheme.typography.headlineMedium,
-                    fontWeight = FontWeight.Bold,
-                    modifier = Modifier.weight(1f)
+                text = "Climbing Sessions",
+                style = MaterialTheme.typography.headlineMedium,
+                fontWeight = FontWeight.Bold,
+                modifier = Modifier.weight(1f),
             )
 
             IconButton(
-                    onClick = {
-                        viewMode =
-                                if (viewMode == ViewMode.LIST) ViewMode.CALENDAR else ViewMode.LIST
-                        selectedDate = null
-                        sharedPreferences.edit { putString("view_mode", viewMode.name) }
-                    }
+                onClick = {
+                    viewMode =
+                        if (viewMode == ViewMode.LIST) ViewMode.CALENDAR else ViewMode.LIST
+                    selectedDate = null
+                    sharedPreferences.edit { putString("view_mode", viewMode.name) }
+                },
             ) {
                 Icon(
-                        imageVector =
-                                if (viewMode == ViewMode.LIST) Icons.Default.CalendarMonth
-                                else Icons.AutoMirrored.Filled.List,
-                        contentDescription =
-                                if (viewMode == ViewMode.LIST) "Calendar View" else "List View",
-                        tint = MaterialTheme.colorScheme.primary
+                    imageVector =
+                    if (viewMode == ViewMode.LIST) {
+                        Icons.Default.CalendarMonth
+                    } else {
+                        Icons.AutoMirrored.Filled.List
+                    },
+                    contentDescription =
+                    if (viewMode == ViewMode.LIST) "Calendar View" else "List View",
+                    tint = MaterialTheme.colorScheme.primary,
                 )
             }
 
@@ -107,10 +114,10 @@ fun SessionsScreen(viewModel: ClimbViewModel, onNavigateToSessionDetail: (String
         Spacer(modifier = Modifier.height(16.dp))
 
         ActiveSessionBanner(
-                activeSession = activeSession,
-                gym = activeSessionGym,
-                onSessionClick = { activeSession?.let { onNavigateToSessionDetail(it.id) } },
-                onEndSession = { activeSession?.let { viewModel.endSession(context, it.id) } }
+            activeSession = activeSession,
+            gym = activeSessionGym,
+            onSessionClick = { activeSession?.let { onNavigateToSessionDetail(it.id) } },
+            onEndSession = { activeSession?.let { viewModel.endSession(context, it.id) } },
         )
 
         if (activeSession != null) {
@@ -119,24 +126,26 @@ fun SessionsScreen(viewModel: ClimbViewModel, onNavigateToSessionDetail: (String
 
         if (completedSessions.isEmpty() && activeSession == null) {
             EmptyStateMessage(
-                    title = if (gyms.isEmpty()) "No Gyms Available" else "No Sessions Yet",
-                    message =
-                            if (gyms.isEmpty())
-                                    "Add a gym first to start tracking your climbing sessions!"
-                            else "Start your first climbing session!",
-                    onActionClick = {},
-                    actionText = ""
+                title = if (gyms.isEmpty()) "No Gyms Available" else "No Sessions Yet",
+                message =
+                if (gyms.isEmpty()) {
+                    "Add a gym first to start tracking your climbing sessions!"
+                } else {
+                    "Start your first climbing session!"
+                },
+                onActionClick = {},
+                actionText = "",
             )
         } else {
             when (viewMode) {
                 ViewMode.LIST -> {
                     LazyColumn {
-                        items(completedSessions) { session ->
+                        items(completedSessions, key = { it.id }) { session ->
                             SessionCard(
-                                    session = session,
-                                    gymName = gyms.find { it.id == session.gymId }?.name
-                                                    ?: "Unknown Gym",
-                                    onClick = { onNavigateToSessionDetail(session.id) }
+                                session = session,
+                                gymName = gyms.find { it.id == session.gymId }?.name
+                                    ?: "Unknown Gym",
+                                onClick = { onNavigateToSessionDetail(session.id) },
                             )
                             Spacer(modifier = Modifier.height(8.dp))
                         }
@@ -144,13 +153,13 @@ fun SessionsScreen(viewModel: ClimbViewModel, onNavigateToSessionDetail: (String
                 }
                 ViewMode.CALENDAR -> {
                     CalendarView(
-                            sessions = completedSessions,
-                            gyms = gyms,
+                        sessions = completedSessions,
+                        gyms = gyms,
                         selectedMonth = selectedMonth,
-                            onMonthChange = { selectedMonth = it },
-                            selectedDate = selectedDate,
-                            onDateSelected = { selectedDate = it },
-                            onNavigateToSessionDetail = onNavigateToSessionDetail
+                        onMonthChange = { selectedMonth = it },
+                        selectedDate = selectedDate,
+                        onDateSelected = { selectedDate = it },
+                        onNavigateToSessionDetail = onNavigateToSessionDetail,
                     )
                 }
             }
@@ -164,27 +173,27 @@ fun SessionsScreen(viewModel: ClimbViewModel, onNavigateToSessionDetail: (String
         }
 
         Card(
-                modifier = Modifier.fillMaxWidth().padding(16.dp),
-                colors =
-                        CardDefaults.cardColors(
-                                containerColor = MaterialTheme.colorScheme.primaryContainer
-                        ),
-                shape = RoundedCornerShape(12.dp)
+            modifier = Modifier.fillMaxWidth().padding(16.dp),
+            colors =
+            CardDefaults.cardColors(
+                containerColor = MaterialTheme.colorScheme.primaryContainer,
+            ),
+            shape = RoundedCornerShape(12.dp),
         ) {
             Row(
-                    modifier = Modifier.fillMaxWidth().padding(16.dp),
-                    verticalAlignment = Alignment.CenterVertically
+                modifier = Modifier.fillMaxWidth().padding(16.dp),
+                verticalAlignment = Alignment.CenterVertically,
             ) {
                 Icon(
-                        Icons.Default.CheckCircle,
-                        contentDescription = null,
-                        tint = MaterialTheme.colorScheme.primary
+                    Icons.Default.CheckCircle,
+                    contentDescription = null,
+                    tint = MaterialTheme.colorScheme.primary,
                 )
                 Spacer(modifier = Modifier.width(8.dp))
                 Text(
-                        text = message,
-                        style = MaterialTheme.typography.bodyMedium,
-                        color = MaterialTheme.colorScheme.onPrimaryContainer
+                    text = message,
+                    style = MaterialTheme.typography.bodyMedium,
+                    color = MaterialTheme.colorScheme.onPrimaryContainer,
                 )
             }
         }
@@ -197,27 +206,27 @@ fun SessionsScreen(viewModel: ClimbViewModel, onNavigateToSessionDetail: (String
         }
 
         Card(
-                modifier = Modifier.fillMaxWidth().padding(16.dp),
-                colors =
-                        CardDefaults.cardColors(
-                                containerColor = MaterialTheme.colorScheme.errorContainer
-                        ),
-                shape = RoundedCornerShape(12.dp)
+            modifier = Modifier.fillMaxWidth().padding(16.dp),
+            colors =
+            CardDefaults.cardColors(
+                containerColor = MaterialTheme.colorScheme.errorContainer,
+            ),
+            shape = RoundedCornerShape(12.dp),
         ) {
             Row(
-                    modifier = Modifier.fillMaxWidth().padding(16.dp),
-                    verticalAlignment = Alignment.CenterVertically
+                modifier = Modifier.fillMaxWidth().padding(16.dp),
+                verticalAlignment = Alignment.CenterVertically,
             ) {
                 Icon(
-                        Icons.Default.Warning,
-                        contentDescription = null,
-                        tint = MaterialTheme.colorScheme.error
+                    Icons.Default.Warning,
+                    contentDescription = null,
+                    tint = MaterialTheme.colorScheme.error,
                 )
                 Spacer(modifier = Modifier.width(8.dp))
                 Text(
-                        text = error,
-                        style = MaterialTheme.typography.bodyMedium,
-                        color = MaterialTheme.colorScheme.onErrorContainer
+                    text = error,
+                    style = MaterialTheme.typography.bodyMedium,
+                    color = MaterialTheme.colorScheme.onErrorContainer,
                 )
             }
         }
@@ -227,21 +236,25 @@ fun SessionsScreen(viewModel: ClimbViewModel, onNavigateToSessionDetail: (String
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun SessionCard(session: ClimbSession, gymName: String, onClick: () -> Unit) {
+    val formattedDate = remember(session.date) {
+        DateFormatUtils.formatDateForDisplay(session.date)
+    }
+
     Card(onClick = onClick, modifier = Modifier.fillMaxWidth()) {
         Column(modifier = Modifier.fillMaxWidth().padding(16.dp)) {
             Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.SpaceBetween
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.SpaceBetween,
             ) {
                 Text(
-                        text = gymName,
-                        style = MaterialTheme.typography.titleMedium,
-                        fontWeight = FontWeight.Bold
+                    text = gymName,
+                    style = MaterialTheme.typography.titleMedium,
+                    fontWeight = FontWeight.Bold,
                 )
                 Text(
-                        text = formatDate(session.date),
-                        style = MaterialTheme.typography.bodyMedium,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                    text = formattedDate,
+                    style = MaterialTheme.typography.bodyMedium,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
                 )
             }
 
@@ -249,8 +262,8 @@ fun SessionCard(session: ClimbSession, gymName: String, onClick: () -> Unit) {
 
             session.duration?.let { duration ->
                 Text(
-                        text = "Duration: $duration minutes",
-                        style = MaterialTheme.typography.bodyMedium
+                    text = "Duration: $duration minutes",
+                    style = MaterialTheme.typography.bodyMedium,
                 )
             }
 
@@ -258,10 +271,10 @@ fun SessionCard(session: ClimbSession, gymName: String, onClick: () -> Unit) {
                 if (notes.isNotBlank()) {
                     Spacer(modifier = Modifier.height(4.dp))
                     Text(
-                            text = notes,
-                            style = MaterialTheme.typography.bodySmall,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant,
-                            maxLines = 2
+                        text = notes,
+                        style = MaterialTheme.typography.bodySmall,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                        maxLines = 2,
                     )
                 }
             }
@@ -271,30 +284,30 @@ fun SessionCard(session: ClimbSession, gymName: String, onClick: () -> Unit) {
 
 @Composable
 fun EmptyStateMessage(
-        title: String,
-        message: String,
-        onActionClick: () -> Unit,
-        actionText: String
+    title: String,
+    message: String,
+    onActionClick: () -> Unit,
+    actionText: String,
 ) {
     Column(
-            modifier = Modifier.fillMaxSize(),
-            horizontalAlignment = Alignment.CenterHorizontally,
-            verticalArrangement = Arrangement.Center
+        modifier = Modifier.fillMaxSize(),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.Center,
     ) {
         Text(
-                text = title,
-                style = MaterialTheme.typography.headlineSmall,
-                fontWeight = FontWeight.Bold,
-                textAlign = TextAlign.Center
+            text = title,
+            style = MaterialTheme.typography.headlineSmall,
+            fontWeight = FontWeight.Bold,
+            textAlign = TextAlign.Center,
         )
 
         Spacer(modifier = Modifier.height(8.dp))
 
         Text(
-                text = message,
-                style = MaterialTheme.typography.bodyLarge,
-                color = MaterialTheme.colorScheme.onSurfaceVariant,
-                textAlign = TextAlign.Center
+            text = message,
+            style = MaterialTheme.typography.bodyLarge,
+            color = MaterialTheme.colorScheme.onSurfaceVariant,
+            textAlign = TextAlign.Center,
         )
 
         if (actionText.isNotEmpty()) {
@@ -307,64 +320,64 @@ fun EmptyStateMessage(
 
 @Composable
 fun CalendarView(
-        sessions: List<ClimbSession>,
-        gyms: List<com.atridad.ascently.data.model.Gym>,
-        selectedMonth: YearMonth,
-        onMonthChange: (YearMonth) -> Unit,
-        selectedDate: LocalDate?,
-        onDateSelected: (LocalDate?) -> Unit,
-        onNavigateToSessionDetail: (String) -> Unit
+    sessions: List<ClimbSession>,
+    gyms: List<com.atridad.ascently.data.model.Gym>,
+    selectedMonth: YearMonth,
+    onMonthChange: (YearMonth) -> Unit,
+    selectedDate: LocalDate?,
+    onDateSelected: (LocalDate?) -> Unit,
+    onNavigateToSessionDetail: (String) -> Unit,
 ) {
     val sessionsByDate =
-            remember(sessions) {
-                sessions.groupBy {
-                    try {
-                        java.time.Instant.parse(it.date)
-                                .atZone(java.time.ZoneId.systemDefault())
-                                .toLocalDate()
-                    } catch (_: Exception) {
-                        LocalDate.parse(it.date, DateTimeFormatter.ISO_LOCAL_DATE)
-                    }
+        remember(sessions) {
+            sessions.groupBy {
+                try {
+                    java.time.Instant.parse(it.date)
+                        .atZone(java.time.ZoneId.systemDefault())
+                        .toLocalDate()
+                } catch (_: Exception) {
+                    LocalDate.parse(it.date, DateTimeFormatter.ISO_LOCAL_DATE)
                 }
             }
+        }
 
     val firstDayOfMonth = selectedMonth.atDay(1)
     val daysInMonth = selectedMonth.lengthOfMonth()
     val firstDayOfWeek = firstDayOfMonth.dayOfWeek.value % 7
     val totalCells =
-            ((firstDayOfWeek + daysInMonth) / 7.0).let {
-                if (it == it.toInt().toDouble()) it.toInt() * 7 else (it.toInt() + 1) * 7
-            }
+        ((firstDayOfWeek + daysInMonth) / 7.0).let {
+            if (it == it.toInt().toDouble()) it.toInt() * 7 else (it.toInt() + 1) * 7
+        }
     val numRows = totalCells / 7
 
     LazyColumn(modifier = Modifier.fillMaxSize()) {
         item {
             Card(
-                    modifier = Modifier.fillMaxWidth(),
-                    colors =
-                            CardDefaults.cardColors(
-                                    containerColor = MaterialTheme.colorScheme.surfaceVariant
-                            )
+                modifier = Modifier.fillMaxWidth(),
+                colors =
+                CardDefaults.cardColors(
+                    containerColor = MaterialTheme.colorScheme.surfaceVariant,
+                ),
             ) {
                 Column(
-                        modifier =
-                                Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 12.dp),
-                        horizontalAlignment = Alignment.CenterHorizontally
+                    modifier =
+                    Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 12.dp),
+                    horizontalAlignment = Alignment.CenterHorizontally,
                 ) {
                     Row(
-                            modifier = Modifier.fillMaxWidth(),
-                            horizontalArrangement = Arrangement.SpaceBetween,
-                            verticalAlignment = Alignment.CenterVertically
+                        modifier = Modifier.fillMaxWidth(),
+                        horizontalArrangement = Arrangement.SpaceBetween,
+                        verticalAlignment = Alignment.CenterVertically,
                     ) {
                         IconButton(onClick = { onMonthChange(selectedMonth.minusMonths(1)) }) {
                             Text("‹", style = MaterialTheme.typography.headlineMedium)
                         }
 
                         Text(
-                                text =
-                                        "${selectedMonth.month.getDisplayName(TextStyle.FULL, Locale.getDefault())} ${selectedMonth.year}",
-                                style = MaterialTheme.typography.titleMedium,
-                                fontWeight = FontWeight.Bold
+                            text =
+                            "${selectedMonth.month.getDisplayName(TextStyle.FULL, Locale.getDefault())} ${selectedMonth.year}",
+                            style = MaterialTheme.typography.titleMedium,
+                            fontWeight = FontWeight.Bold,
                         )
 
                         IconButton(onClick = { onMonthChange(selectedMonth.plusMonths(1)) }) {
@@ -375,22 +388,22 @@ fun CalendarView(
                     Spacer(modifier = Modifier.height(8.dp))
 
                     Button(
-                            onClick = {
-                                val today = LocalDate.now()
-                                onMonthChange(YearMonth.from(today))
-                                onDateSelected(today)
-                            },
-                            shape = RoundedCornerShape(50),
-                            colors =
-                                    ButtonDefaults.buttonColors(
-                                            containerColor = MaterialTheme.colorScheme.primary
-                                    ),
-                            contentPadding = PaddingValues(horizontal = 20.dp, vertical = 8.dp)
+                        onClick = {
+                            val today = LocalDate.now()
+                            onMonthChange(YearMonth.from(today))
+                            onDateSelected(today)
+                        },
+                        shape = RoundedCornerShape(50),
+                        colors =
+                        ButtonDefaults.buttonColors(
+                            containerColor = MaterialTheme.colorScheme.primary,
+                        ),
+                        contentPadding = PaddingValues(horizontal = 20.dp, vertical = 8.dp),
                     ) {
                         Text(
-                                text = "Today",
-                                style = MaterialTheme.typography.labelLarge,
-                                fontWeight = FontWeight.SemiBold
+                            text = "Today",
+                            style = MaterialTheme.typography.labelLarge,
+                            fontWeight = FontWeight.SemiBold,
                         )
                     }
                 }
@@ -401,12 +414,12 @@ fun CalendarView(
             Row(modifier = Modifier.fillMaxWidth()) {
                 listOf("Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat").forEach { day ->
                     Text(
-                            text = day,
-                            modifier = Modifier.weight(1f),
-                            textAlign = TextAlign.Center,
-                            style = MaterialTheme.typography.labelSmall,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant,
-                            fontWeight = FontWeight.Bold
+                        text = day,
+                        modifier = Modifier.weight(1f),
+                        textAlign = TextAlign.Center,
+                        style = MaterialTheme.typography.labelSmall,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                        fontWeight = FontWeight.Bold,
                     )
                 }
             }
@@ -428,15 +441,15 @@ fun CalendarView(
                             val isToday = date == LocalDate.now()
 
                             CalendarDay(
-                                    day = dayNumber,
-                                    hasSession = sessionsOnDate.isNotEmpty(),
-                                    isSelected = isSelected,
-                                    isToday = isToday,
-                                    onClick = {
-                                        if (sessionsOnDate.isNotEmpty()) {
-                                            onDateSelected(if (isSelected) null else date)
-                                        }
+                                day = dayNumber,
+                                hasSession = sessionsOnDate.isNotEmpty(),
+                                isSelected = isSelected,
+                                isToday = isToday,
+                                onClick = {
+                                    if (sessionsOnDate.isNotEmpty()) {
+                                        onDateSelected(if (isSelected) null else date)
                                     }
+                                },
                             )
                         } else {
                             Spacer(modifier = Modifier.aspectRatio(1f))
@@ -453,19 +466,19 @@ fun CalendarView(
                 Spacer(modifier = Modifier.height(16.dp))
 
                 Text(
-                        text =
-                                "Sessions on ${selectedDate.format(DateTimeFormatter.ofPattern("MMMM d, yyyy"))}",
-                        style = MaterialTheme.typography.titleSmall,
-                        fontWeight = FontWeight.Bold,
-                        modifier = Modifier.padding(vertical = 8.dp)
+                    text =
+                    "Sessions on ${selectedDate.format(DateTimeFormatter.ofPattern("MMMM d, yyyy"))}",
+                    style = MaterialTheme.typography.titleSmall,
+                    fontWeight = FontWeight.Bold,
+                    modifier = Modifier.padding(vertical = 8.dp),
                 )
             }
 
             items(sessionsOnSelectedDate) { session ->
                 SessionCard(
-                        session = session,
-                        gymName = gyms.find { it.id == session.gymId }?.name ?: "Unknown Gym",
-                        onClick = { onNavigateToSessionDetail(session.id) }
+                    session = session,
+                    gymName = gyms.find { it.id == session.gymId }?.name ?: "Unknown Gym",
+                    onClick = { onNavigateToSessionDetail(session.id) },
                 )
                 Spacer(modifier = Modifier.height(8.dp))
             }
@@ -477,62 +490,60 @@ fun CalendarView(
 
 @Composable
 fun CalendarDay(
-        day: Int,
-        hasSession: Boolean,
-        isSelected: Boolean,
-        isToday: Boolean,
-        onClick: () -> Unit
+    day: Int,
+    hasSession: Boolean,
+    isSelected: Boolean,
+    isToday: Boolean,
+    onClick: () -> Unit,
 ) {
     Box(
-            modifier =
-                    Modifier.aspectRatio(1f)
-                            .padding(2.dp)
-                            .clip(CircleShape)
-                            .background(
-                                    when {
-                                        isSelected -> MaterialTheme.colorScheme.primaryContainer
-                                        isToday -> MaterialTheme.colorScheme.secondaryContainer
-                                        else -> Color.Transparent
-                                    }
-                            )
-                            .clickable(enabled = hasSession, onClick = onClick),
-            contentAlignment = Alignment.Center
+        modifier =
+        Modifier.aspectRatio(1f)
+            .padding(2.dp)
+            .clip(CircleShape)
+            .background(
+                when {
+                    isSelected -> MaterialTheme.colorScheme.primaryContainer
+                    isToday -> MaterialTheme.colorScheme.secondaryContainer
+                    else -> Color.Transparent
+                },
+            )
+            .clickable(enabled = hasSession, onClick = onClick),
+        contentAlignment = Alignment.Center,
     ) {
         Column(
-                horizontalAlignment = Alignment.CenterHorizontally,
-                verticalArrangement = Arrangement.Center
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.Center,
         ) {
             Text(
-                    text = day.toString(),
-                    style = MaterialTheme.typography.bodyMedium,
-                    color =
-                            when {
-                                isSelected -> MaterialTheme.colorScheme.onPrimaryContainer
-                                isToday -> MaterialTheme.colorScheme.onSecondaryContainer
-                                !hasSession -> MaterialTheme.colorScheme.onSurfaceVariant
-                                else -> MaterialTheme.colorScheme.onSurface
-                            },
-                    fontWeight = if (hasSession || isToday) FontWeight.Bold else FontWeight.Normal
+                text = day.toString(),
+                style = MaterialTheme.typography.bodyMedium,
+                color =
+                when {
+                    isSelected -> MaterialTheme.colorScheme.onPrimaryContainer
+                    isToday -> MaterialTheme.colorScheme.onSecondaryContainer
+                    !hasSession -> MaterialTheme.colorScheme.onSurfaceVariant
+                    else -> MaterialTheme.colorScheme.onSurface
+                },
+                fontWeight = if (hasSession || isToday) FontWeight.Bold else FontWeight.Normal,
             )
 
             if (hasSession) {
                 Box(
-                        modifier =
-                                Modifier.size(6.dp)
-                                        .clip(CircleShape)
-                                        .background(
-                                                if (isSelected) MaterialTheme.colorScheme.primary
-                                                else
-                                                        MaterialTheme.colorScheme.primary.copy(
-                                                                alpha = 0.7f
-                                                        )
-                                        )
+                    modifier =
+                    Modifier.size(6.dp)
+                        .clip(CircleShape)
+                        .background(
+                            if (isSelected) {
+                                MaterialTheme.colorScheme.primary
+                            } else {
+                                MaterialTheme.colorScheme.primary.copy(
+                                    alpha = 0.7f,
+                                )
+                            },
+                        ),
                 )
             }
         }
     }
 }
-
-private fun formatDate(dateString: String): String {
-    return DateFormatUtils.formatDateForDisplay(dateString)
-}

android/app/src/main/java/com/atridad/ascently/ui/theme/Color.kt

@@ -63,4 +63,4 @@ val ClimbNeutralVariant30 = Color(0xFF484848)
 val ClimbNeutralVariant50 = Color(0xFF797979)
 val ClimbNeutralVariant60 = Color(0xFF939393)
 val ClimbNeutralVariant80 = Color(0xFFC7C7C7)
-val ClimbNeutralVariant90 = Color(0xFFE3E3E3)
+val ClimbNeutralVariant90 = Color(0xFFE3E3E3)

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

@@ -12,9 +12,9 @@ object CustomIcons {
         defaultWidth = 24.dp,
         defaultHeight = 24.dp,
         viewportWidth = 24f,
-        viewportHeight = 24f
+        viewportHeight = 24f,
     ).path(
-        fill = SolidColor(color)
+        fill = SolidColor(color),
     ) {
         moveTo(6f, 6f)
         horizontalLineTo(18f)

android/app/src/main/java/com/atridad/ascently/ui/theme/Theme.kt

@@ -47,7 +47,7 @@ private val DarkColorScheme = darkColorScheme(
     surfaceContainerLow = ClimbNeutral10,
     surfaceContainer = ClimbNeutral12,
     surfaceContainerHigh = ClimbNeutral17,
-    surfaceContainerHighest = ClimbNeutral22
+    surfaceContainerHighest = ClimbNeutral22,
 )
 
 // Climbing-themed light color scheme with full Material You compatibility
@@ -84,7 +84,7 @@ private val LightColorScheme = lightColorScheme(
     surfaceContainerLow = ClimbNeutral96,
     surfaceContainer = ClimbNeutral94,
     surfaceContainerHigh = ClimbNeutral92,
-    surfaceContainerHighest = ClimbNeutral90
+    surfaceContainerHighest = ClimbNeutral90,
 )
 
 @Composable
@@ -93,7 +93,7 @@ fun AscentlyTheme(
     // Dynamic color is available on Android 12+ and provides full Material You theming
     // When enabled, it adapts to the user's system wallpaper colors
     dynamicColor: Boolean = true,
-    content: @Composable () -> Unit
+    content: @Composable () -> Unit,
 ) {
     val colorScheme = when {
         dynamicColor && true -> {
@@ -103,7 +103,7 @@ fun AscentlyTheme(
         darkTheme -> DarkColorScheme
         else -> LightColorScheme
     }
-    
+
     val view = LocalView.current
     if (!view.isInEditMode) {
         SideEffect {
@@ -116,6 +116,6 @@ fun AscentlyTheme(
     MaterialTheme(
         colorScheme = colorScheme,
         typography = Typography,
-        content = content
+        content = content,
     )
-}
+}

android/app/src/main/java/com/atridad/ascently/ui/theme/Type.kt

@@ -13,6 +13,6 @@ val Typography = Typography(
         fontWeight = FontWeight.Normal,
         fontSize = 16.sp,
         lineHeight = 24.sp,
-        letterSpacing = 0.5.sp
-    )
-)
+        letterSpacing = 0.5.sp,
+    ),
+)

android/app/src/main/java/com/atridad/ascently/ui/viewmodel/ClimbViewModel.kt

@@ -11,14 +11,14 @@ import com.atridad.ascently.service.SessionTrackingService
 import com.atridad.ascently.utils.AppLogger
 import com.atridad.ascently.utils.ImageUtils
 import com.atridad.ascently.widget.ClimbStatsWidgetProvider
-import java.io.File
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
+import java.io.File
 
 class ClimbViewModel(
     private val repository: ClimbRepository,
     val syncService: SyncService,
-    private val context: Context
+    private val context: Context,
 ) : ViewModel() {
 
     // Health Connect manager
@@ -35,7 +35,7 @@ class ClimbViewModel(
             .stateIn(
                 scope = viewModelScope,
                 started = SharingStarted.WhileSubscribed(),
-                initialValue = emptyList()
+                initialValue = emptyList(),
             )
 
     val problems =
@@ -44,7 +44,7 @@ class ClimbViewModel(
             .stateIn(
                 scope = viewModelScope,
                 started = SharingStarted.WhileSubscribed(),
-                initialValue = emptyList()
+                initialValue = emptyList(),
             )
 
     val sessions =
@@ -53,7 +53,7 @@ class ClimbViewModel(
             .stateIn(
                 scope = viewModelScope,
                 started = SharingStarted.WhileSubscribed(),
-                initialValue = emptyList()
+                initialValue = emptyList(),
             )
 
     val activeSession =
@@ -62,7 +62,7 @@ class ClimbViewModel(
             .stateIn(
                 scope = viewModelScope,
                 started = SharingStarted.WhileSubscribed(),
-                initialValue = null
+                initialValue = null,
             )
 
     val attempts =
@@ -71,7 +71,7 @@ class ClimbViewModel(
             .stateIn(
                 scope = viewModelScope,
                 started = SharingStarted.WhileSubscribed(),
-                initialValue = emptyList()
+                initialValue = emptyList(),
             )
 
     // Gym operations
@@ -243,7 +243,7 @@ class ClimbViewModel(
                 _uiState.value =
                     _uiState.value.copy(
                         error =
-                            "Notification permission is required to track your climbing session. Please enable notifications in settings."
+                        "Notification permission is required to track your climbing session. Please enable notifications in settings.",
                     )
                 return@launch
             }
@@ -253,7 +253,7 @@ class ClimbViewModel(
                 AppLogger.d("ClimbViewModel") { "Active session already exists: ${existingActive.id}" }
                 _uiState.value =
                     _uiState.value.copy(
-                        error = "There's already an active session. Please end it first."
+                        error = "There's already an active session. Please end it first.",
                     )
                 return@launch
             }
@@ -281,7 +281,7 @@ class ClimbViewModel(
                 _uiState.value =
                     _uiState.value.copy(
                         error =
-                            "Notification permission is required to manage your climbing session. Please enable notifications in settings."
+                        "Notification permission is required to manage your climbing session. Please enable notifications in settings.",
                     )
                 return@launch
             }
@@ -354,20 +354,20 @@ class ClimbViewModel(
                 _uiState.value =
                     _uiState.value.copy(
                         isLoading = true,
-                        message = "Creating ZIP file with images..."
+                        message = "Creating ZIP file with images...",
                     )
                 repository.exportAllDataToZipUri(context, uri)
                 _uiState.value =
                     _uiState.value.copy(
                         isLoading = false,
                         message =
-                            "Export complete! Your climbing data and images have been saved."
+                        "Export complete! Your climbing data and images have been saved.",
                     )
             } catch (e: Exception) {
                 _uiState.value =
                     _uiState.value.copy(
                         isLoading = false,
-                        error = "Export failed: ${e.message}"
+                        error = "Export failed: ${e.message}",
                     )
             }
         }
@@ -380,7 +380,7 @@ class ClimbViewModel(
 
                 if (!file.name.lowercase().endsWith(".zip")) {
                     throw Exception(
-                        "Only ZIP files are supported for import. Please use a ZIP file exported from Ascently."
+                        "Only ZIP files are supported for import. Please use a ZIP file exported from Ascently.",
                     )
                 }
 
@@ -389,13 +389,13 @@ class ClimbViewModel(
                 _uiState.value =
                     _uiState.value.copy(
                         isLoading = false,
-                        message = "Data imported successfully from ${file.name}"
+                        message = "Data imported successfully from ${file.name}",
                     )
             } catch (e: Exception) {
                 _uiState.value =
                     _uiState.value.copy(
                         isLoading = false,
-                        error = "Import failed: ${e.message}"
+                        error = "Import failed: ${e.message}",
                     )
             }
         }
@@ -411,11 +411,13 @@ class ClimbViewModel(
     }
 
     // Sync-related methods
-    suspend fun performManualSync() {
-        try {
-            syncService.syncWithServer()
-        } catch (e: Exception) {
-            setError("Sync failed: ${e.message}")
+    fun performManualSync() {
+        viewModelScope.launch {
+            try {
+                syncService.syncWithServer()
+            } catch (e: Exception) {
+                setError("Sync failed: ${e.message}")
+            }
         }
     }
 
@@ -445,7 +447,7 @@ class ClimbViewModel(
                 _uiState.value =
                     _uiState.value.copy(
                         isLoading = false,
-                        message = "All data has been reset successfully"
+                        message = "All data has been reset successfully",
                     )
             } catch (e: Exception) {
                 _uiState.value =
@@ -467,7 +469,7 @@ class ClimbViewModel(
                     healthConnectManager.autoSyncCompletedSession(
                         session,
                         gymName,
-                        attemptCount
+                        attemptCount,
                     )
 
                 result.onFailure { error ->
@@ -487,5 +489,5 @@ class ClimbViewModel(
 data class ClimbUiState(
     val isLoading: Boolean = false,
     val message: String? = null,
-    val error: String? = null
+    val error: String? = null,
 )

android/app/src/main/java/com/atridad/ascently/ui/viewmodel/ClimbViewModelFactory.kt

@@ -7,9 +7,9 @@ import com.atridad.ascently.data.repository.ClimbRepository
 import com.atridad.ascently.data.sync.SyncService
 
 class ClimbViewModelFactory(
-        private val repository: ClimbRepository,
-        private val syncService: SyncService,
-        private val context: Context
+    private val repository: ClimbRepository,
+    private val syncService: SyncService,
+    private val context: Context,
 ) : ViewModelProvider.Factory {
 
     @Suppress("UNCHECKED_CAST")

android/app/src/main/java/com/atridad/ascently/utils/AppLogger.kt

@@ -11,7 +11,7 @@ object AppLogger {
         DEBUG(Log.DEBUG),
         INFO(Log.INFO),
         WARN(Log.WARN),
-        ERROR(Log.ERROR)
+        ERROR(Log.ERROR),
     }
 
     fun d(tag: String = DEFAULT_TAG, messageProvider: () -> String) {
@@ -34,7 +34,7 @@ object AppLogger {
         level: Level,
         tag: String,
         messageProvider: () -> String,
-        throwable: Throwable? = null
+        throwable: Throwable? = null,
     ) {
         if (!BuildConfig.DEBUG) return
 

android/app/src/main/java/com/atridad/ascently/utils/DateFormatUtils.kt

@@ -10,7 +10,7 @@ object DateFormatUtils {
 
     // ISO 8601 formatter matching iOS date format exactly
     private val ISO_FORMATTER =
-            DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSX").withZone(ZoneOffset.UTC)
+        DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSX").withZone(ZoneOffset.UTC)
 
     /** Get current timestamp in iOS-compatible ISO 8601 format */
     fun nowISO8601(): String {
@@ -22,7 +22,6 @@ object DateFormatUtils {
         return try {
             Instant.from(ISO_FORMATTER.parse(dateString))
         } catch (_: Exception) {
-
             try {
                 Instant.parse(dateString)
             } catch (_: Exception) {

android/app/src/main/java/com/atridad/ascently/utils/ImageNamingUtils.kt

@@ -13,7 +13,7 @@ object ImageNamingUtils {
 
     /** Generates a deterministic filename for a problem image */
     fun generateImageFilename(problemId: String, imageIndex: Int): String {
-        val input = "${problemId}_${imageIndex}"
+        val input = "${problemId}_$imageIndex"
         val hash = createHash(input)
 
         return "problem_${hash}_${imageIndex}${IMAGE_EXTENSION}"

android/app/src/main/java/com/atridad/ascently/utils/ImageUtils.kt

@@ -32,7 +32,7 @@ object ImageUtils {
         context: Context,
         imageUri: Uri,
         originalBitmap: Bitmap,
-        outputFile: File
+        outputFile: File,
     ): Boolean {
         return try {
             // Get EXIF data from original image
@@ -147,12 +147,16 @@ object ImageUtils {
             val imagesDir = getImagesDirectory(context)
             imagesDir.listFiles()?.mapNotNull { file ->
                 if (file.isFile &&
-                    (file.extension == "jpg" ||
+                    (
+                        file.extension == "jpg" ||
                             file.extension == "jpeg" ||
-                            file.extension == "png")
+                            file.extension == "png"
+                        )
                 ) {
                     "$IMAGES_DIR/${file.name}"
-                } else null
+                } else {
+                    null
+                }
             }
                 ?: emptyList()
         } catch (e: Exception) {
@@ -187,7 +191,7 @@ object ImageUtils {
         context: Context,
         tempFilename: String,
         problemId: String,
-        imageIndex: Int
+        imageIndex: Int,
     ): String? {
         return try {
             val tempFile = File(getImagesDirectory(context), tempFilename)
@@ -217,7 +221,7 @@ object ImageUtils {
     fun saveImageFromBytesWithFilename(
         context: Context,
         imageData: ByteArray,
-        filename: String
+        filename: String,
     ): String? {
         return try {
             val imageFile = File(getImagesDirectory(context), filename)

android/app/src/main/java/com/atridad/ascently/utils/MigrationManager.kt

@@ -51,7 +51,7 @@ class MigrationManager(private val context: Context) {
                 "openclimb_data_state" to "ascently_data_state",
                 "health_connect_prefs" to "health_connect_prefs", // Keep same name
                 "deleted_items" to "deleted_items", // Keep same name
-                "sync_preferences" to "sync_preferences" // Keep same name
+                "sync_preferences" to "sync_preferences", // Keep same name
             )
 
         for ((oldFileName, newFileName) in preferenceFileMigrations) {
@@ -82,7 +82,8 @@ class MigrationManager(private val context: Context) {
                         is Float -> putFloat(key, value)
                         is Boolean -> putBoolean(key, value)
                         is Set<*> -> {
-                            @Suppress("UNCHECKED_CAST") putStringSet(key, value as Set<String>)
+                            @Suppress("UNCHECKED_CAST")
+                            putStringSet(key, value as Set<String>)
                         }
                     }
                 }
@@ -108,7 +109,7 @@ class MigrationManager(private val context: Context) {
                 "ascently_data_state",
                 "health_connect_prefs",
                 "deleted_items",
-                "sync_preferences"
+                "sync_preferences",
             )
 
         for (prefFileName in preferencesToCheck) {

android/app/src/main/java/com/atridad/ascently/utils/NotificationPermissionUtils.kt

@@ -6,24 +6,24 @@ import android.content.pm.PackageManager
 import androidx.core.content.ContextCompat
 
 object NotificationPermissionUtils {
-    
+
     /**
      * Check if notification permission is granted
      */
     fun isNotificationPermissionGranted(context: Context): Boolean {
         return ContextCompat.checkSelfPermission(
             context,
-            Manifest.permission.POST_NOTIFICATIONS
+            Manifest.permission.POST_NOTIFICATIONS,
         ) == PackageManager.PERMISSION_GRANTED
     }
-    
+
     /**
      * Check if notification permission should be requested
      */
     fun shouldRequestNotificationPermission(): Boolean {
         return true
     }
-    
+
     /**
      * Get the notification permission string
      */

android/app/src/main/java/com/atridad/ascently/utils/ShortcutManager.kt

@@ -20,10 +20,10 @@ object AppShortcutManager {
 
     /** Updates the app shortcuts based on current session state */
     fun updateShortcuts(
-            context: Context,
-            hasActiveSession: Boolean,
-            hasGyms: Boolean,
-            lastUsedGym: com.atridad.ascently.data.model.Gym? = null
+        context: Context,
+        hasActiveSession: Boolean,
+        hasGyms: Boolean,
+        lastUsedGym: com.atridad.ascently.data.model.Gym? = null,
     ) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
             val shortcutManager = context.getSystemService(ShortcutManager::class.java)
@@ -44,52 +44,52 @@ object AppShortcutManager {
 
     @RequiresApi(Build.VERSION_CODES.N_MR1)
     private fun createStartSessionShortcut(
-            context: Context,
-            lastUsedGym: com.atridad.ascently.data.model.Gym? = null
+        context: Context,
+        lastUsedGym: com.atridad.ascently.data.model.Gym? = null,
     ): ShortcutInfo {
         val startIntent =
-                Intent(context, MainActivity::class.java).apply {
-                    action = ACTION_START_SESSION
-                    flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
-                    lastUsedGym?.let { gym -> putExtra("LAST_USED_GYM_ID", gym.id) }
-                }
+            Intent(context, MainActivity::class.java).apply {
+                action = ACTION_START_SESSION
+                flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
+                lastUsedGym?.let { gym -> putExtra("LAST_USED_GYM_ID", gym.id) }
+            }
 
         val shortLabel =
-                if (lastUsedGym != null) {
-                    "Start at ${lastUsedGym.name}"
-                } else {
-                    context.getString(R.string.shortcut_start_session_short)
-                }
+            if (lastUsedGym != null) {
+                "Start at ${lastUsedGym.name}"
+            } else {
+                context.getString(R.string.shortcut_start_session_short)
+            }
 
         val longLabel =
-                if (lastUsedGym != null) {
-                    "Start a new climbing session at ${lastUsedGym.name}"
-                } else {
-                    context.getString(R.string.shortcut_start_session_long)
-                }
+            if (lastUsedGym != null) {
+                "Start a new climbing session at ${lastUsedGym.name}"
+            } else {
+                context.getString(R.string.shortcut_start_session_long)
+            }
 
         return ShortcutInfo.Builder(context, SHORTCUT_START_SESSION)
-                .setShortLabel(shortLabel)
-                .setLongLabel(longLabel)
-                .setIcon(Icon.createWithResource(context, R.drawable.ic_play_arrow_24))
-                .setIntent(startIntent)
-                .build()
+            .setShortLabel(shortLabel)
+            .setLongLabel(longLabel)
+            .setIcon(Icon.createWithResource(context, R.drawable.ic_play_arrow_24))
+            .setIntent(startIntent)
+            .build()
     }
 
     @RequiresApi(Build.VERSION_CODES.N_MR1)
     private fun createEndSessionShortcut(context: Context): ShortcutInfo {
         val endIntent =
-                Intent(context, MainActivity::class.java).apply {
-                    action = ACTION_END_SESSION
-                    flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
-                }
+            Intent(context, MainActivity::class.java).apply {
+                action = ACTION_END_SESSION
+                flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
+            }
 
         return ShortcutInfo.Builder(context, SHORTCUT_END_SESSION)
-                .setShortLabel(context.getString(R.string.shortcut_end_session_short))
-                .setLongLabel(context.getString(R.string.shortcut_end_session_long))
-                .setIcon(Icon.createWithResource(context, R.drawable.ic_stop_24))
-                .setIntent(endIntent)
-                .build()
+            .setShortLabel(context.getString(R.string.shortcut_end_session_short))
+            .setLongLabel(context.getString(R.string.shortcut_end_session_long))
+            .setIcon(Icon.createWithResource(context, R.drawable.ic_stop_24))
+            .setIntent(endIntent)
+            .build()
     }
 
     /** Removes all dynamic shortcuts */

android/app/src/main/java/com/atridad/ascently/utils/ZipExportImportUtils.kt

@@ -3,6 +3,8 @@ package com.atridad.ascently.utils
 import android.content.Context
 import com.atridad.ascently.data.format.BackupProblem
 import com.atridad.ascently.data.format.ClimbDataBackup
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
 import java.io.File
 import java.io.FileInputStream
 import java.io.FileOutputStream
@@ -11,8 +13,6 @@ import java.time.LocalDateTime
 import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream
 import java.util.zip.ZipOutputStream
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
 
 object ZipExportImportUtils {
 
@@ -25,15 +25,15 @@ object ZipExportImportUtils {
         context: Context,
         exportData: ClimbDataBackup,
         referencedImagePaths: Set<String>,
-        directory: File? = null
+        directory: File? = null,
     ): File {
         val exportDir =
             directory
                 ?: File(
                     context.getExternalFilesDir(
-                        android.os.Environment.DIRECTORY_DOCUMENTS
+                        android.os.Environment.DIRECTORY_DOCUMENTS,
                     ),
-                    "Ascently"
+                    "Ascently",
                 )
         if (!exportDir.exists()) {
             exportDir.mkdirs()
@@ -92,7 +92,7 @@ object ZipExportImportUtils {
 
                 // Log export summary
                 AppLogger.i("ZipExportImportUtils") {
-                    "Export completed: ${successfulImages}/${referencedImagePaths.size} images included"
+                    "Export completed: $successfulImages/${referencedImagePaths.size} images included"
                 }
             }
 
@@ -116,7 +116,7 @@ object ZipExportImportUtils {
         context: Context,
         uri: android.net.Uri,
         exportData: ClimbDataBackup,
-        referencedImagePaths: Set<String>
+        referencedImagePaths: Set<String>,
     ) {
         try {
             context.contentResolver.openOutputStream(uri)?.use { outputStream ->
@@ -164,7 +164,7 @@ object ZipExportImportUtils {
                     }
 
                     AppLogger.i("ZipExportImportUtils") {
-                        "Export to URI completed: ${successfulImages}/${referencedImagePaths.size} images included"
+                        "Export to URI completed: $successfulImages/${referencedImagePaths.size} images included"
                     }
                 }
             }
@@ -176,7 +176,7 @@ object ZipExportImportUtils {
 
     private fun createMetadata(
         exportData: ClimbDataBackup,
-        referencedImagePaths: Set<String>
+        referencedImagePaths: Set<String>,
     ): String {
         return buildString {
             appendLine("Ascently Export Metadata")
@@ -195,7 +195,7 @@ object ZipExportImportUtils {
     /** Data class to hold extraction results */
     data class ImportResult(
         val jsonContent: String,
-        val importedImagePaths: Map<String, String> // original filename -> new relative path
+        val importedImagePaths: Map<String, String>, // original filename -> new relative path
     )
 
     /** Extracts a ZIP file and returns the JSON content and imported image paths */
@@ -235,7 +235,7 @@ object ZipExportImportUtils {
                                     File.createTempFile(
                                         "import_image_",
                                         "_$originalFilename",
-                                        context.cacheDir
+                                        context.cacheDir,
                                     )
 
                                 FileOutputStream(tempFile).use { output -> zipIn.copyTo(output) }
@@ -306,7 +306,7 @@ object ZipExportImportUtils {
      */
     fun updateProblemImagePaths(
         problems: List<BackupProblem>,
-        imagePathMapping: Map<String, String>
+        imagePathMapping: Map<String, String>,
     ): List<BackupProblem> {
         return problems.map { problem ->
             val updatedImagePaths =

android/app/src/main/java/com/atridad/ascently/widget/ClimbStatsWidgetProvider.kt

@@ -11,12 +11,12 @@ import com.atridad.ascently.MainActivity
 import com.atridad.ascently.R
 import com.atridad.ascently.data.database.AscentlyDatabase
 import com.atridad.ascently.data.repository.ClimbRepository
-import java.time.LocalDate
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
+import java.time.LocalDate
 
 class ClimbStatsWidgetProvider : AppWidgetProvider() {
 
@@ -24,9 +24,9 @@ class ClimbStatsWidgetProvider : AppWidgetProvider() {
     private val coroutineScope = CoroutineScope(Dispatchers.IO + job)
 
     override fun onUpdate(
-            context: Context,
-            appWidgetManager: AppWidgetManager,
-            appWidgetIds: IntArray
+        context: Context,
+        appWidgetManager: AppWidgetManager,
+        appWidgetIds: IntArray,
     ) {
         for (appWidgetId in appWidgetIds) {
             updateAppWidget(context, appWidgetManager, appWidgetId)
@@ -40,9 +40,9 @@ class ClimbStatsWidgetProvider : AppWidgetProvider() {
     }
 
     private fun updateAppWidget(
-            context: Context,
-            appWidgetManager: AppWidgetManager,
-            appWidgetId: Int
+        context: Context,
+        appWidgetManager: AppWidgetManager,
+        appWidgetId: Int,
     ) {
         coroutineScope.launch {
             try {
@@ -59,20 +59,20 @@ class ClimbStatsWidgetProvider : AppWidgetProvider() {
 
                 // Filter for last 7 days across all gyms
                 val weekSessions =
-                        sessions.filter { session ->
-                            try {
-                                val sessionDate = LocalDate.parse(session.date.substring(0, 10))
-                                !sessionDate.isBefore(sevenDaysAgo) && !sessionDate.isAfter(today)
-                            } catch (_: Exception) {
-                                false
-                            }
+                    sessions.filter { session ->
+                        try {
+                            val sessionDate = LocalDate.parse(session.date.substring(0, 10))
+                            !sessionDate.isBefore(sevenDaysAgo) && !sessionDate.isAfter(today)
+                        } catch (_: Exception) {
+                            false
                         }
+                    }
 
                 val weekSessionIds = weekSessions.map { it.id }.toSet()
 
                 // Count total attempts this week
                 val totalAttempts =
-                        attempts.count { attempt -> weekSessionIds.contains(attempt.sessionId) }
+                    attempts.count { attempt -> weekSessionIds.contains(attempt.sessionId) }
 
                 // Count sessions this week
                 val totalSessions = weekSessions.size
@@ -85,19 +85,19 @@ class ClimbStatsWidgetProvider : AppWidgetProvider() {
                     views.setTextViewText(R.id.widget_sessions_value, totalSessions.toString())
 
                     val intent =
-                            Intent(context, MainActivity::class.java).apply {
-                                flags =
-                                        Intent.FLAG_ACTIVITY_NEW_TASK or
-                                                Intent.FLAG_ACTIVITY_CLEAR_TOP
-                            }
+                        Intent(context, MainActivity::class.java).apply {
+                            flags =
+                                Intent.FLAG_ACTIVITY_NEW_TASK or
+                                Intent.FLAG_ACTIVITY_CLEAR_TOP
+                        }
                     val pendingIntent =
-                            PendingIntent.getActivity(
-                                    context,
-                                    0,
-                                    intent,
-                                    PendingIntent.FLAG_UPDATE_CURRENT or
-                                            PendingIntent.FLAG_IMMUTABLE
-                            )
+                        PendingIntent.getActivity(
+                            context,
+                            0,
+                            intent,
+                            PendingIntent.FLAG_UPDATE_CURRENT or
+                                PendingIntent.FLAG_IMMUTABLE,
+                        )
                     views.setOnClickPendingIntent(R.id.widget_container, pendingIntent)
 
                     appWidgetManager.updateAppWidget(appWidgetId, views)
@@ -110,13 +110,13 @@ class ClimbStatsWidgetProvider : AppWidgetProvider() {
 
                     val intent = Intent(context, MainActivity::class.java)
                     val pendingIntent =
-                            PendingIntent.getActivity(
-                                    context,
-                                    0,
-                                    intent,
-                                    PendingIntent.FLAG_UPDATE_CURRENT or
-                                            PendingIntent.FLAG_IMMUTABLE
-                            )
+                        PendingIntent.getActivity(
+                            context,
+                            0,
+                            intent,
+                            PendingIntent.FLAG_UPDATE_CURRENT or
+                                PendingIntent.FLAG_IMMUTABLE,
+                        )
                     views.setOnClickPendingIntent(R.id.widget_container, pendingIntent)
 
                     appWidgetManager.updateAppWidget(appWidgetId, views)
@@ -132,10 +132,10 @@ class ClimbStatsWidgetProvider : AppWidgetProvider() {
             val appWidgetIds = appWidgetManager.getAppWidgetIds(componentName)
 
             val intent =
-                    Intent(context, ClimbStatsWidgetProvider::class.java).apply {
-                        action = AppWidgetManager.ACTION_APPWIDGET_UPDATE
-                        putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, appWidgetIds)
-                    }
+                Intent(context, ClimbStatsWidgetProvider::class.java).apply {
+                    action = AppWidgetManager.ACTION_APPWIDGET_UPDATE
+                    putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, appWidgetIds)
+                }
             context.sendBroadcast(intent)
         }
     }

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

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

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

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

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

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

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

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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>

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

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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>

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

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

android/app/src/main/res/xml/data_extraction_rules.xml

@@ -5,10 +5,6 @@
 -->
 <data-extraction-rules>
     <cloud-backup>
-        <!-- TODO: Use <include> and <exclude> to control what is backed up.
-        <include .../>
-        <exclude .../>
-        -->
     </cloud-backup>
     <!--
     <device-transfer>

android/app/src/test/java/com/atridad/openclimb/BusinessLogicTests.kt

@@ -2,10 +2,10 @@ package com.atridad.ascently
 
 import com.atridad.ascently.data.format.*
 import com.atridad.ascently.data.model.*
-import java.time.LocalDateTime
-import java.time.format.DateTimeFormatter
 import org.junit.Assert.*
 import org.junit.Test
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
 
 class BusinessLogicTests {
 
@@ -21,11 +21,11 @@ class BusinessLogicTests {
         assertNull(session.duration)
 
         val completedSession =
-                session.copy(
-                        status = SessionStatus.COMPLETED,
-                        endTime = getCurrentTimestamp(),
-                        duration = 7200L
-                )
+            session.copy(
+                status = SessionStatus.COMPLETED,
+                endTime = getCurrentTimestamp(),
+                duration = 7200L,
+            )
         assertEquals(SessionStatus.COMPLETED, completedSession.status)
         assertNotNull(completedSession.endTime)
         assertNotNull(completedSession.duration)
@@ -38,12 +38,12 @@ class BusinessLogicTests {
         val session = ClimbSession.create(gym.id)
 
         val attempt =
-                Attempt.create(
-                        sessionId = session.id,
-                        problemId = problem.id,
-                        result = AttemptResult.SUCCESS,
-                        notes = "Clean send!"
-                )
+            Attempt.create(
+                sessionId = session.id,
+                problemId = problem.id,
+                result = AttemptResult.SUCCESS,
+                notes = "Clean send!",
+            )
 
         assertEquals(session.id, attempt.sessionId)
         assertEquals(problem.id, attempt.problemId)
@@ -76,12 +76,12 @@ class BusinessLogicTests {
         val problem2 = createTestProblem(gym.id)
 
         val attempts =
-                listOf(
-                        Attempt.create(session.id, problem1.id, AttemptResult.SUCCESS),
-                        Attempt.create(session.id, problem1.id, AttemptResult.FALL),
-                        Attempt.create(session.id, problem2.id, AttemptResult.FLASH),
-                        Attempt.create(session.id, problem2.id, AttemptResult.SUCCESS)
-                )
+            listOf(
+                Attempt.create(session.id, problem1.id, AttemptResult.SUCCESS),
+                Attempt.create(session.id, problem1.id, AttemptResult.FALL),
+                Attempt.create(session.id, problem2.id, AttemptResult.FLASH),
+                Attempt.create(session.id, problem2.id, AttemptResult.SUCCESS),
+            )
 
         val sessionStats = calculateSessionStatistics(session, attempts)
 
@@ -97,17 +97,17 @@ class BusinessLogicTests {
         val session = ClimbSession.create(gym.id)
 
         val problems =
-                listOf(
-                        createTestProblemWithGrade(gym.id, "V3"),
-                        createTestProblemWithGrade(gym.id, "V4"),
-                        createTestProblemWithGrade(gym.id, "V5"),
-                        createTestProblemWithGrade(gym.id, "V6")
-                )
+            listOf(
+                createTestProblemWithGrade(gym.id, "V3"),
+                createTestProblemWithGrade(gym.id, "V4"),
+                createTestProblemWithGrade(gym.id, "V5"),
+                createTestProblemWithGrade(gym.id, "V6"),
+            )
 
         val attempts =
-                problems.map { problem ->
-                    Attempt.create(session.id, problem.id, AttemptResult.SUCCESS)
-                }
+            problems.map { problem ->
+                Attempt.create(session.id, problem.id, AttemptResult.SUCCESS)
+            }
 
         val progression = calculateDifficultyProgression(attempts, problems)
 
@@ -123,17 +123,17 @@ class BusinessLogicTests {
         val problems = listOf(createTestProblem(gym.id), createTestProblem(gym.id))
         val session = ClimbSession.create(gym.id)
         val attempts =
-                problems.map { problem ->
-                    Attempt.create(session.id, problem.id, AttemptResult.SUCCESS)
-                }
+            problems.map { problem ->
+                Attempt.create(session.id, problem.id, AttemptResult.SUCCESS)
+            }
 
         val backup =
-                createBackupData(
-                        gyms = listOf(gym),
-                        problems = problems,
-                        sessions = listOf(session),
-                        attempts = attempts
-                )
+            createBackupData(
+                gyms = listOf(gym),
+                problems = problems,
+                sessions = listOf(session),
+                attempts = attempts,
+            )
 
         validateBackupIntegrity(backup)
 
@@ -146,30 +146,30 @@ class BusinessLogicTests {
     @Test
     fun testClimbTypeCompatibilityRules() {
         val boulderGym =
-                Gym(
-                        id = "boulder_gym",
-                        name = "Boulder Gym",
-                        location = "Boulder City",
-                        supportedClimbTypes = listOf(ClimbType.BOULDER),
-                        difficultySystems = listOf(DifficultySystem.V_SCALE, DifficultySystem.FONT),
-                        customDifficultyGrades = emptyList(),
-                        notes = null,
-                        createdAt = getCurrentTimestamp(),
-                        updatedAt = getCurrentTimestamp()
-                )
+            Gym(
+                id = "boulder_gym",
+                name = "Boulder Gym",
+                location = "Boulder City",
+                supportedClimbTypes = listOf(ClimbType.BOULDER),
+                difficultySystems = listOf(DifficultySystem.V_SCALE, DifficultySystem.FONT),
+                customDifficultyGrades = emptyList(),
+                notes = null,
+                createdAt = getCurrentTimestamp(),
+                updatedAt = getCurrentTimestamp(),
+            )
 
         val ropeGym =
-                Gym(
-                        id = "rope_gym",
-                        name = "Rope Gym",
-                        location = "Rope City",
-                        supportedClimbTypes = listOf(ClimbType.ROPE),
-                        difficultySystems = listOf(DifficultySystem.YDS),
-                        customDifficultyGrades = emptyList(),
-                        notes = null,
-                        createdAt = getCurrentTimestamp(),
-                        updatedAt = getCurrentTimestamp()
-                )
+            Gym(
+                id = "rope_gym",
+                name = "Rope Gym",
+                location = "Rope City",
+                supportedClimbTypes = listOf(ClimbType.ROPE),
+                difficultySystems = listOf(DifficultySystem.YDS),
+                customDifficultyGrades = emptyList(),
+                notes = null,
+                createdAt = getCurrentTimestamp(),
+                updatedAt = getCurrentTimestamp(),
+            )
 
         // Boulder gym should support boulder problems with V-Scale
         assertTrue(isCompatibleClimbType(boulderGym, ClimbType.BOULDER, DifficultySystem.V_SCALE))
@@ -197,26 +197,26 @@ class BusinessLogicTests {
         val session = ClimbSession.create(gym.id)
 
         val attempts =
-                listOf(
-                        createAttemptWithTimestamp(
-                                session.id,
-                                problem.id,
-                                "2024-01-01T10:00:00Z",
-                                AttemptResult.FALL
-                        ),
-                        createAttemptWithTimestamp(
-                                session.id,
-                                problem.id,
-                                "2024-01-01T10:05:00Z",
-                                AttemptResult.FALL
-                        ),
-                        createAttemptWithTimestamp(
-                                session.id,
-                                problem.id,
-                                "2024-01-01T10:10:00Z",
-                                AttemptResult.SUCCESS
-                        )
-                )
+            listOf(
+                createAttemptWithTimestamp(
+                    session.id,
+                    problem.id,
+                    "2024-01-01T10:00:00Z",
+                    AttemptResult.FALL,
+                ),
+                createAttemptWithTimestamp(
+                    session.id,
+                    problem.id,
+                    "2024-01-01T10:05:00Z",
+                    AttemptResult.FALL,
+                ),
+                createAttemptWithTimestamp(
+                    session.id,
+                    problem.id,
+                    "2024-01-01T10:10:00Z",
+                    AttemptResult.SUCCESS,
+                ),
+            )
 
         val sequence = AttemptSequence(attempts)
 
@@ -230,32 +230,32 @@ class BusinessLogicTests {
     @Test
     fun testGradeConsistencyValidation() {
         val validCombinations =
-                listOf(
-                        Pair(ClimbType.BOULDER, DifficultySystem.V_SCALE),
-                        Pair(ClimbType.BOULDER, DifficultySystem.FONT),
-                        Pair(ClimbType.ROPE, DifficultySystem.YDS),
-                        Pair(ClimbType.BOULDER, DifficultySystem.CUSTOM),
-                        Pair(ClimbType.ROPE, DifficultySystem.CUSTOM)
-                )
+            listOf(
+                Pair(ClimbType.BOULDER, DifficultySystem.V_SCALE),
+                Pair(ClimbType.BOULDER, DifficultySystem.FONT),
+                Pair(ClimbType.ROPE, DifficultySystem.YDS),
+                Pair(ClimbType.BOULDER, DifficultySystem.CUSTOM),
+                Pair(ClimbType.ROPE, DifficultySystem.CUSTOM),
+            )
 
         val invalidCombinations =
-                listOf(
-                        Pair(ClimbType.BOULDER, DifficultySystem.YDS),
-                        Pair(ClimbType.ROPE, DifficultySystem.V_SCALE),
-                        Pair(ClimbType.ROPE, DifficultySystem.FONT)
-                )
+            listOf(
+                Pair(ClimbType.BOULDER, DifficultySystem.YDS),
+                Pair(ClimbType.ROPE, DifficultySystem.V_SCALE),
+                Pair(ClimbType.ROPE, DifficultySystem.FONT),
+            )
 
         validCombinations.forEach { (climbType, difficultySystem) ->
             assertTrue(
-                    "$climbType should be compatible with $difficultySystem",
-                    isValidGradeCombination(climbType, difficultySystem)
+                "$climbType should be compatible with $difficultySystem",
+                isValidGradeCombination(climbType, difficultySystem),
             )
         }
 
         invalidCombinations.forEach { (climbType, difficultySystem) ->
             assertFalse(
-                    "$climbType should not be compatible with $difficultySystem",
-                    isValidGradeCombination(climbType, difficultySystem)
+                "$climbType should not be compatible with $difficultySystem",
+                isValidGradeCombination(climbType, difficultySystem),
             )
         }
     }
@@ -276,11 +276,11 @@ class BusinessLogicTests {
     @Test
     fun testImagePathHandling() {
         val originalPaths =
-                listOf(
-                        "/storage/images/problem1.jpg",
-                        "/data/cache/problem2.png",
-                        "relative/path/problem3.jpeg"
-                )
+            listOf(
+                "/storage/images/problem1.jpg",
+                "/data/cache/problem2.png",
+                "relative/path/problem3.jpeg",
+            )
 
         val relativePaths = convertToRelativePaths(originalPaths)
 
@@ -295,76 +295,76 @@ class BusinessLogicTests {
 
     private fun createTestGym(): Gym {
         return Gym(
-                id = "test_gym_1",
-                name = "Test Climbing Gym",
-                location = "Test City",
-                supportedClimbTypes = listOf(ClimbType.BOULDER, ClimbType.ROPE),
-                difficultySystems = listOf(DifficultySystem.V_SCALE, DifficultySystem.YDS),
-                customDifficultyGrades = emptyList(),
-                notes = "Test gym for unit testing",
-                createdAt = getCurrentTimestamp(),
-                updatedAt = getCurrentTimestamp()
+            id = "test_gym_1",
+            name = "Test Climbing Gym",
+            location = "Test City",
+            supportedClimbTypes = listOf(ClimbType.BOULDER, ClimbType.ROPE),
+            difficultySystems = listOf(DifficultySystem.V_SCALE, DifficultySystem.YDS),
+            customDifficultyGrades = emptyList(),
+            notes = "Test gym for unit testing",
+            createdAt = getCurrentTimestamp(),
+            updatedAt = getCurrentTimestamp(),
         )
     }
 
     private fun createTestProblem(
-            gymId: String,
-            climbType: ClimbType = ClimbType.BOULDER
+        gymId: String,
+        climbType: ClimbType = ClimbType.BOULDER,
     ): Problem {
         val difficulty =
-                when (climbType) {
-                    ClimbType.BOULDER -> DifficultyGrade(DifficultySystem.V_SCALE, "V5")
-                    ClimbType.ROPE -> DifficultyGrade(DifficultySystem.YDS, "5.10a")
-                }
+            when (climbType) {
+                ClimbType.BOULDER -> DifficultyGrade(DifficultySystem.V_SCALE, "V5")
+                ClimbType.ROPE -> DifficultyGrade(DifficultySystem.YDS, "5.10a")
+            }
 
         return Problem(
-                id = "test_problem_${java.util.UUID.randomUUID()}",
-                gymId = gymId,
-                name = "Test Problem",
-                description = "A test climbing problem",
-                climbType = climbType,
-                difficulty = difficulty,
-                tags = listOf("test", "overhang"),
-                location = "Wall A",
-                imagePaths = emptyList(),
-                isActive = true,
-                dateSet = "2024-01-01",
-                notes = null,
-                createdAt = getCurrentTimestamp(),
-                updatedAt = getCurrentTimestamp()
+            id = "test_problem_${java.util.UUID.randomUUID()}",
+            gymId = gymId,
+            name = "Test Problem",
+            description = "A test climbing problem",
+            climbType = climbType,
+            difficulty = difficulty,
+            tags = listOf("test", "overhang"),
+            location = "Wall A",
+            imagePaths = emptyList(),
+            isActive = true,
+            dateSet = "2024-01-01",
+            notes = null,
+            createdAt = getCurrentTimestamp(),
+            updatedAt = getCurrentTimestamp(),
         )
     }
 
     private fun createTestProblemWithGrade(gymId: String, grade: String): Problem {
         return Problem(
-                id = "test_problem_${java.util.UUID.randomUUID()}",
-                gymId = gymId,
-                name = "Test Problem $grade",
-                description = null,
-                climbType = ClimbType.BOULDER,
-                difficulty = DifficultyGrade(DifficultySystem.V_SCALE, grade),
-                tags = emptyList(),
-                location = null,
-                imagePaths = emptyList(),
-                isActive = true,
-                dateSet = null,
-                notes = null,
-                createdAt = getCurrentTimestamp(),
-                updatedAt = getCurrentTimestamp()
+            id = "test_problem_${java.util.UUID.randomUUID()}",
+            gymId = gymId,
+            name = "Test Problem $grade",
+            description = null,
+            climbType = ClimbType.BOULDER,
+            difficulty = DifficultyGrade(DifficultySystem.V_SCALE, grade),
+            tags = emptyList(),
+            location = null,
+            imagePaths = emptyList(),
+            isActive = true,
+            dateSet = null,
+            notes = null,
+            createdAt = getCurrentTimestamp(),
+            updatedAt = getCurrentTimestamp(),
         )
     }
 
     private fun createAttemptWithTimestamp(
-            sessionId: String,
-            problemId: String,
-            timestamp: String,
-            result: AttemptResult
+        sessionId: String,
+        problemId: String,
+        timestamp: String,
+        result: AttemptResult,
     ): Attempt {
         return Attempt.create(
-                sessionId = sessionId,
-                problemId = problemId,
-                result = result,
-                timestamp = timestamp
+            sessionId = sessionId,
+            problemId = problemId,
+            result = result,
+            timestamp = timestamp,
         )
     }
 
@@ -373,126 +373,126 @@ class BusinessLogicTests {
     }
 
     private fun calculateSessionStatistics(
-            session: ClimbSession,
-            attempts: List<Attempt>
+        session: ClimbSession,
+        attempts: List<Attempt>,
     ): SessionStatistics {
         val successful =
-                attempts.count {
-                    it.result == AttemptResult.SUCCESS || it.result == AttemptResult.FLASH
-                }
+            attempts.count {
+                it.result == AttemptResult.SUCCESS || it.result == AttemptResult.FLASH
+            }
         val uniqueProblems = attempts.map { it.problemId }.toSet().size
         val successRate = (successful.toDouble() / attempts.size) * 100
 
         return SessionStatistics(
-                totalAttempts = attempts.size,
-                successfulAttempts = successful,
-                uniqueProblems = uniqueProblems,
-                successRate = successRate
+            totalAttempts = attempts.size,
+            successfulAttempts = successful,
+            uniqueProblems = uniqueProblems,
+            successRate = successRate,
         )
     }
 
     private fun calculateDifficultyProgression(
-            attempts: List<Attempt>,
-            problems: List<Problem>
+        attempts: List<Attempt>,
+        problems: List<Problem>,
     ): DifficultyProgression {
         val problemMap = problems.associateBy { it.id }
         val grades =
-                attempts
-                        .mapNotNull { attempt -> problemMap[attempt.problemId]?.difficulty?.grade }
-                        .filter { it.startsWith("V") }
+            attempts
+                .mapNotNull { attempt -> problemMap[attempt.problemId]?.difficulty?.grade }
+                .filter { it.startsWith("V") }
 
         val numericGrades =
-                grades.mapNotNull { grade ->
-                    when (grade) {
-                        "VB" -> 0
-                        else -> grade.removePrefix("V").toIntOrNull()
-                    }
+            grades.mapNotNull { grade ->
+                when (grade) {
+                    "VB" -> 0
+                    else -> grade.removePrefix("V").toIntOrNull()
                 }
+            }
 
         val minGrade = "V${numericGrades.minOrNull() ?: 0}".replace("V0", "VB")
         val maxGrade = "V${numericGrades.maxOrNull() ?: 0}".replace("V0", "VB")
         val avgGrade = numericGrades.average()
         val showsProgression =
-                numericGrades.size > 1 &&
-                        (numericGrades.maxOrNull() ?: 0) > (numericGrades.minOrNull() ?: 0)
+            numericGrades.size > 1 &&
+                (numericGrades.maxOrNull() ?: 0) > (numericGrades.minOrNull() ?: 0)
 
         return DifficultyProgression(minGrade, maxGrade, avgGrade, showsProgression)
     }
 
     private fun createBackupData(
-            gyms: List<Gym>,
-            problems: List<Problem>,
-            sessions: List<ClimbSession>,
-            attempts: List<Attempt>
+        gyms: List<Gym>,
+        problems: List<Problem>,
+        sessions: List<ClimbSession>,
+        attempts: List<Attempt>,
     ): ClimbDataBackup {
         return ClimbDataBackup(
-                exportedAt = getCurrentTimestamp(),
-                version = "2.0",
-                formatVersion = "2.0",
-                gyms =
-                        gyms.map { gym ->
-                            BackupGym(
-                                    id = gym.id,
-                                    name = gym.name,
-                                    location = gym.location,
-                                    supportedClimbTypes = gym.supportedClimbTypes,
-                                    difficultySystems = gym.difficultySystems,
-                                    customDifficultyGrades = gym.customDifficultyGrades,
-                                    notes = gym.notes,
-                                    createdAt = gym.createdAt,
-                                    updatedAt = gym.updatedAt
-                            )
-                        },
-                problems =
-                        problems.map { problem ->
-                            BackupProblem(
-                                    id = problem.id,
-                                    gymId = problem.gymId,
-                                    name = problem.name,
-                                    description = problem.description,
-                                    climbType = problem.climbType,
-                                    difficulty = problem.difficulty,
-                                    tags = problem.tags,
-                                    location = problem.location,
-                                    imagePaths = problem.imagePaths,
-                                    isActive = problem.isActive,
-                                    dateSet = problem.dateSet,
-                                    notes = problem.notes,
-                                    createdAt = problem.createdAt,
-                                    updatedAt = problem.updatedAt
-                            )
-                        },
-                sessions =
-                        sessions.map { session ->
-                            BackupClimbSession(
-                                    id = session.id,
-                                    gymId = session.gymId,
-                                    date = session.date,
-                                    startTime = session.startTime,
-                                    endTime = session.endTime,
-                                    duration = session.duration,
-                                    status = session.status,
-                                    notes = session.notes,
-                                    createdAt = session.createdAt,
-                                    updatedAt = session.updatedAt
-                            )
-                        },
-                attempts =
-                        attempts.map { attempt ->
-                            BackupAttempt(
-                                    id = attempt.id,
-                                    sessionId = attempt.sessionId,
-                                    problemId = attempt.problemId,
-                                    result = attempt.result,
-                                    highestHold = attempt.highestHold,
-                                    notes = attempt.notes,
-                                    duration = attempt.duration,
-                                    restTime = attempt.restTime,
-                                    timestamp = attempt.timestamp,
-                                    createdAt = attempt.createdAt,
-                                    updatedAt = attempt.updatedAt,
-                            )
-                        }
+            exportedAt = getCurrentTimestamp(),
+            version = "2.0",
+            formatVersion = "2.0",
+            gyms =
+            gyms.map { gym ->
+                BackupGym(
+                    id = gym.id,
+                    name = gym.name,
+                    location = gym.location,
+                    supportedClimbTypes = gym.supportedClimbTypes,
+                    difficultySystems = gym.difficultySystems,
+                    customDifficultyGrades = gym.customDifficultyGrades,
+                    notes = gym.notes,
+                    createdAt = gym.createdAt,
+                    updatedAt = gym.updatedAt,
+                )
+            },
+            problems =
+            problems.map { problem ->
+                BackupProblem(
+                    id = problem.id,
+                    gymId = problem.gymId,
+                    name = problem.name,
+                    description = problem.description,
+                    climbType = problem.climbType,
+                    difficulty = problem.difficulty,
+                    tags = problem.tags,
+                    location = problem.location,
+                    imagePaths = problem.imagePaths,
+                    isActive = problem.isActive,
+                    dateSet = problem.dateSet,
+                    notes = problem.notes,
+                    createdAt = problem.createdAt,
+                    updatedAt = problem.updatedAt,
+                )
+            },
+            sessions =
+            sessions.map { session ->
+                BackupClimbSession(
+                    id = session.id,
+                    gymId = session.gymId,
+                    date = session.date,
+                    startTime = session.startTime,
+                    endTime = session.endTime,
+                    duration = session.duration,
+                    status = session.status,
+                    notes = session.notes,
+                    createdAt = session.createdAt,
+                    updatedAt = session.updatedAt,
+                )
+            },
+            attempts =
+            attempts.map { attempt ->
+                BackupAttempt(
+                    id = attempt.id,
+                    sessionId = attempt.sessionId,
+                    problemId = attempt.problemId,
+                    result = attempt.result,
+                    highestHold = attempt.highestHold,
+                    notes = attempt.notes,
+                    duration = attempt.duration,
+                    restTime = attempt.restTime,
+                    timestamp = attempt.timestamp,
+                    createdAt = attempt.createdAt,
+                    updatedAt = attempt.updatedAt,
+                )
+            },
         )
     }
 
@@ -501,8 +501,8 @@ class BusinessLogicTests {
         val gymIds = backup.gyms.map { it.id }.toSet()
         backup.problems.forEach { problem ->
             assertTrue(
-                    "Problem ${problem.id} references non-existent gym ${problem.gymId}",
-                    gymIds.contains(problem.gymId)
+                "Problem ${problem.id} references non-existent gym ${problem.gymId}",
+                gymIds.contains(problem.gymId),
             )
         }
 
@@ -510,8 +510,8 @@ class BusinessLogicTests {
         val sessionIds = backup.sessions.map { it.id }.toSet()
         backup.attempts.forEach { attempt ->
             assertTrue(
-                    "Attempt ${attempt.id} references non-existent session ${attempt.sessionId}",
-                    sessionIds.contains(attempt.sessionId)
+                "Attempt ${attempt.id} references non-existent session ${attempt.sessionId}",
+                sessionIds.contains(attempt.sessionId),
             )
         }
 
@@ -519,19 +519,19 @@ class BusinessLogicTests {
         val problemIds = backup.problems.map { it.id }.toSet()
         backup.attempts.forEach { attempt ->
             assertTrue(
-                    "Attempt ${attempt.id} references non-existent problem ${attempt.problemId}",
-                    problemIds.contains(attempt.problemId)
+                "Attempt ${attempt.id} references non-existent problem ${attempt.problemId}",
+                problemIds.contains(attempt.problemId),
             )
         }
     }
 
     private fun isCompatibleClimbType(
-            gym: Gym,
-            climbType: ClimbType,
-            difficultySystem: DifficultySystem
+        gym: Gym,
+        climbType: ClimbType,
+        difficultySystem: DifficultySystem,
     ): Boolean {
         return gym.supportedClimbTypes.contains(climbType) &&
-                gym.difficultySystems.contains(difficultySystem)
+            gym.difficultySystems.contains(difficultySystem)
     }
 
     private fun calculateSessionDuration(startTime: String, endTime: String): Long {
@@ -541,19 +541,19 @@ class BusinessLogicTests {
     }
 
     private fun isValidGradeCombination(
-            climbType: ClimbType,
-            difficultySystem: DifficultySystem
+        climbType: ClimbType,
+        difficultySystem: DifficultySystem,
     ): Boolean {
         return when (climbType) {
             ClimbType.BOULDER ->
-                    difficultySystem in
-                            listOf(
-                                    DifficultySystem.V_SCALE,
-                                    DifficultySystem.FONT,
-                                    DifficultySystem.CUSTOM
-                            )
+                difficultySystem in
+                    listOf(
+                        DifficultySystem.V_SCALE,
+                        DifficultySystem.FONT,
+                        DifficultySystem.CUSTOM,
+                    )
             ClimbType.ROPE ->
-                    difficultySystem in listOf(DifficultySystem.YDS, DifficultySystem.CUSTOM)
+                difficultySystem in listOf(DifficultySystem.YDS, DifficultySystem.CUSTOM)
         }
     }
 
@@ -568,29 +568,29 @@ class BusinessLogicTests {
     // Data classes for testing
 
     data class SessionStatistics(
-            val totalAttempts: Int,
-            val successfulAttempts: Int,
-            val uniqueProblems: Int,
-            val successRate: Double
+        val totalAttempts: Int,
+        val successfulAttempts: Int,
+        val uniqueProblems: Int,
+        val successRate: Double,
     )
 
     data class DifficultyProgression(
-            val minGrade: String,
-            val maxGrade: String,
-            val averageGrade: Double,
-            val showsProgression: Boolean
+        val minGrade: String,
+        val maxGrade: String,
+        val averageGrade: Double,
+        val showsProgression: Boolean,
     )
 
     data class AttemptSequence(val attempts: List<Attempt>) {
         val totalAttempts = attempts.size
         val failedAttempts =
-                attempts.count {
-                    it.result == AttemptResult.FALL || it.result == AttemptResult.NO_PROGRESS
-                }
+            attempts.count {
+                it.result == AttemptResult.FALL || it.result == AttemptResult.NO_PROGRESS
+            }
         val successfulAttempts =
-                attempts.count {
-                    it.result == AttemptResult.SUCCESS || it.result == AttemptResult.FLASH
-                }
+            attempts.count {
+                it.result == AttemptResult.SUCCESS || it.result == AttemptResult.FLASH
+            }
         val finalResult = attempts.lastOrNull()?.result
 
         fun isValidSequence(): Boolean {

android/app/src/test/java/com/atridad/openclimb/DataModelTests.kt

@@ -2,10 +2,10 @@ package com.atridad.ascently
 
 import com.atridad.ascently.data.format.*
 import com.atridad.ascently.data.model.*
-import java.time.Instant
-import java.time.format.DateTimeFormatter
 import org.junit.Assert.*
 import org.junit.Test
+import java.time.Instant
+import java.time.format.DateTimeFormatter
 
 class DataModelTests {
 
@@ -141,17 +141,17 @@ class DataModelTests {
     @Test
     fun testBackupGymCreationAndValidation() {
         val gym =
-                BackupGym(
-                        id = "gym123",
-                        name = "Test Climbing Gym",
-                        location = "Test City",
-                        supportedClimbTypes = listOf(ClimbType.BOULDER, ClimbType.ROPE),
-                        difficultySystems = listOf(DifficultySystem.V_SCALE, DifficultySystem.YDS),
-                        customDifficultyGrades = emptyList(),
-                        notes = "Great gym for beginners",
-                        createdAt = "2024-01-01T10:00:00Z",
-                        updatedAt = "2024-01-01T10:00:00Z"
-                )
+            BackupGym(
+                id = "gym123",
+                name = "Test Climbing Gym",
+                location = "Test City",
+                supportedClimbTypes = listOf(ClimbType.BOULDER, ClimbType.ROPE),
+                difficultySystems = listOf(DifficultySystem.V_SCALE, DifficultySystem.YDS),
+                customDifficultyGrades = emptyList(),
+                notes = "Great gym for beginners",
+                createdAt = "2024-01-01T10:00:00Z",
+                updatedAt = "2024-01-01T10:00:00Z",
+            )
 
         assertEquals("gym123", gym.id)
         assertEquals("Test Climbing Gym", gym.name)
@@ -167,22 +167,22 @@ class DataModelTests {
     @Test
     fun testBackupProblemCreationAndValidation() {
         val problem =
-                BackupProblem(
-                        id = "problem123",
-                        gymId = "gym123",
-                        name = "Test Problem",
-                        description = "A challenging boulder problem",
-                        climbType = ClimbType.BOULDER,
-                        difficulty = DifficultyGrade(DifficultySystem.V_SCALE, "V5"),
-                        tags = listOf("overhang", "crimpy"),
-                        location = "Wall A",
-                        imagePaths = listOf("image1.jpg", "image2.jpg"),
-                        isActive = true,
-                        dateSet = "2024-01-01",
-                        notes = "Watch the start holds",
-                        createdAt = "2024-01-01T10:00:00Z",
-                        updatedAt = "2024-01-01T10:00:00Z"
-                )
+            BackupProblem(
+                id = "problem123",
+                gymId = "gym123",
+                name = "Test Problem",
+                description = "A challenging boulder problem",
+                climbType = ClimbType.BOULDER,
+                difficulty = DifficultyGrade(DifficultySystem.V_SCALE, "V5"),
+                tags = listOf("overhang", "crimpy"),
+                location = "Wall A",
+                imagePaths = listOf("image1.jpg", "image2.jpg"),
+                isActive = true,
+                dateSet = "2024-01-01",
+                notes = "Watch the start holds",
+                createdAt = "2024-01-01T10:00:00Z",
+                updatedAt = "2024-01-01T10:00:00Z",
+            )
 
         assertEquals("problem123", problem.id)
         assertEquals("gym123", problem.gymId)
@@ -190,25 +190,25 @@ class DataModelTests {
         assertEquals(ClimbType.BOULDER, problem.climbType)
         assertEquals("V5", problem.difficulty.grade)
         assertTrue(problem.isActive)
-        assertEquals(2, problem.tags.size)
+        assertEquals(2, problem.tags?.size ?: 0)
         assertEquals(2, problem.imagePaths?.size ?: 0)
     }
 
     @Test
     fun testBackupClimbSessionCreationAndValidation() {
         val session =
-                BackupClimbSession(
-                        id = "session123",
-                        gymId = "gym123",
-                        date = "2024-01-01",
-                        startTime = "2024-01-01T10:00:00Z",
-                        endTime = "2024-01-01T12:00:00Z",
-                        duration = 7200,
-                        status = SessionStatus.COMPLETED,
-                        notes = "Great session today",
-                        createdAt = "2024-01-01T10:00:00Z",
-                        updatedAt = "2024-01-01T12:00:00Z"
-                )
+            BackupClimbSession(
+                id = "session123",
+                gymId = "gym123",
+                date = "2024-01-01",
+                startTime = "2024-01-01T10:00:00Z",
+                endTime = "2024-01-01T12:00:00Z",
+                duration = 7200,
+                status = SessionStatus.COMPLETED,
+                notes = "Great session today",
+                createdAt = "2024-01-01T10:00:00Z",
+                updatedAt = "2024-01-01T12:00:00Z",
+            )
 
         assertEquals("session123", session.id)
         assertEquals("gym123", session.gymId)
@@ -220,19 +220,19 @@ class DataModelTests {
     @Test
     fun testBackupAttemptCreationAndValidation() {
         val attempt =
-                BackupAttempt(
-                        id = "attempt123",
-                        sessionId = "session123",
-                        problemId = "problem123",
-                        result = AttemptResult.SUCCESS,
-                        highestHold = "Top",
-                        notes = "Stuck it on second try",
-                        duration = 300,
-                        restTime = 120,
-                        timestamp = "2024-01-01T10:30:00Z",
-                        createdAt = "2024-01-01T10:30:00Z",
-                        updatedAt = "2024-01-01T10:30:00Z"
-                )
+            BackupAttempt(
+                id = "attempt123",
+                sessionId = "session123",
+                problemId = "problem123",
+                result = AttemptResult.SUCCESS,
+                highestHold = "Top",
+                notes = "Stuck it on second try",
+                duration = 300,
+                restTime = 120,
+                timestamp = "2024-01-01T10:30:00Z",
+                createdAt = "2024-01-01T10:30:00Z",
+                updatedAt = "2024-01-01T10:30:00Z",
+            )
 
         assertEquals("attempt123", attempt.id)
         assertEquals("session123", attempt.sessionId)
@@ -246,15 +246,15 @@ class DataModelTests {
     @Test
     fun testClimbDataBackupCreationAndValidation() {
         val backup =
-                ClimbDataBackup(
-                        exportedAt = "2024-01-01T10:00:00Z",
-                        version = "2.0",
-                        formatVersion = "2.0",
-                        gyms = emptyList(),
-                        problems = emptyList(),
-                        sessions = emptyList(),
-                        attempts = emptyList()
-                )
+            ClimbDataBackup(
+                exportedAt = "2024-01-01T10:00:00Z",
+                version = "2.0",
+                formatVersion = "2.0",
+                gyms = emptyList(),
+                problems = emptyList(),
+                sessions = emptyList(),
+                attempts = emptyList(),
+            )
 
         assertEquals("2.0", backup.version)
         assertEquals("2.0", backup.formatVersion)
@@ -280,18 +280,18 @@ class DataModelTests {
     @Test
     fun testSessionDurationCalculation() {
         val session =
-                BackupClimbSession(
-                        id = "test",
-                        gymId = "gym1",
-                        date = "2024-01-01",
-                        startTime = "2024-01-01T10:00:00Z",
-                        endTime = "2024-01-01T12:00:00Z",
-                        duration = 7200,
-                        status = SessionStatus.COMPLETED,
-                        notes = null,
-                        createdAt = "2024-01-01T10:00:00Z",
-                        updatedAt = "2024-01-01T12:00:00Z"
-                )
+            BackupClimbSession(
+                id = "test",
+                gymId = "gym1",
+                date = "2024-01-01",
+                startTime = "2024-01-01T10:00:00Z",
+                endTime = "2024-01-01T12:00:00Z",
+                duration = 7200,
+                status = SessionStatus.COMPLETED,
+                notes = null,
+                createdAt = "2024-01-01T10:00:00Z",
+                updatedAt = "2024-01-01T12:00:00Z",
+            )
 
         assertEquals(7200L, session.duration)
         val hours = session.duration!! / 3600
@@ -301,21 +301,21 @@ class DataModelTests {
     @Test
     fun testEmptyCollectionsHandling() {
         val gym =
-                BackupGym(
-                        id = "gym1",
-                        name = "Test Gym",
-                        location = null,
-                        supportedClimbTypes = emptyList(),
-                        difficultySystems = emptyList(),
-                        customDifficultyGrades = emptyList(),
-                        notes = null,
-                        createdAt = "2024-01-01T10:00:00Z",
-                        updatedAt = "2024-01-01T10:00:00Z"
-                )
+            BackupGym(
+                id = "gym1",
+                name = "Test Gym",
+                location = null,
+                supportedClimbTypes = emptyList(),
+                difficultySystems = emptyList(),
+                customDifficultyGrades = emptyList(),
+                notes = null,
+                createdAt = "2024-01-01T10:00:00Z",
+                updatedAt = "2024-01-01T10:00:00Z",
+            )
 
-        assertTrue(gym.supportedClimbTypes.isEmpty())
-        assertTrue(gym.difficultySystems.isEmpty())
-        assertTrue(gym.customDifficultyGrades.isEmpty())
+        assertTrue(gym.supportedClimbTypes?.isEmpty() ?: true)
+        assertTrue(gym.difficultySystems?.isEmpty() ?: true)
+        assertTrue(gym.customDifficultyGrades?.isEmpty() ?: true)
         assertNull(gym.location)
         assertNull(gym.notes)
     }
@@ -323,29 +323,29 @@ class DataModelTests {
     @Test
     fun testNullableFieldsHandling() {
         val problem =
-                BackupProblem(
-                        id = "problem1",
-                        gymId = "gym1",
-                        name = null,
-                        description = null,
-                        climbType = ClimbType.BOULDER,
-                        difficulty = DifficultyGrade(DifficultySystem.V_SCALE, "V1"),
-                        tags = emptyList(),
-                        location = null,
-                        imagePaths = null,
-                        isActive = true,
-                        dateSet = null,
-                        notes = null,
-                        createdAt = "2024-01-01T10:00:00Z",
-                        updatedAt = "2024-01-01T10:00:00Z"
-                )
+            BackupProblem(
+                id = "problem1",
+                gymId = "gym1",
+                name = null,
+                description = null,
+                climbType = ClimbType.BOULDER,
+                difficulty = DifficultyGrade(DifficultySystem.V_SCALE, "V1"),
+                tags = emptyList(),
+                location = null,
+                imagePaths = null,
+                isActive = true,
+                dateSet = null,
+                notes = null,
+                createdAt = "2024-01-01T10:00:00Z",
+                updatedAt = "2024-01-01T10:00:00Z",
+            )
 
         assertNull(problem.name)
         assertNull(problem.description)
         assertNull(problem.location)
         assertNull(problem.dateSet)
         assertNull(problem.notes)
-        assertTrue(problem.tags.isEmpty())
+        assertTrue(problem.tags?.isEmpty() ?: true)
         assertNull(problem.imagePaths)
     }
 
@@ -362,7 +362,7 @@ class DataModelTests {
     @Test
     fun testBackupDataFormatValidation() {
         val testJson =
-                """
+            """
         {
             "exportedAt": "2024-01-01T10:00:00Z",
             "version": "2.0",
@@ -372,7 +372,7 @@ class DataModelTests {
             "sessions": [],
             "attempts": []
         }
-        """.trimIndent()
+            """.trimIndent()
 
         assertTrue(testJson.contains("exportedAt"))
         assertTrue(testJson.contains("version"))
@@ -397,44 +397,44 @@ class DataModelTests {
     fun testClimbTypeAndDifficultySystemCompatibility() {
         // Test that V_SCALE works with BOULDER
         val boulderProblem =
-                BackupProblem(
-                        id = "boulder1",
-                        gymId = "gym1",
-                        name = "Boulder Problem",
-                        description = null,
-                        climbType = ClimbType.BOULDER,
-                        difficulty = DifficultyGrade(DifficultySystem.V_SCALE, "V3"),
-                        tags = emptyList(),
-                        location = null,
-                        imagePaths = null,
-                        isActive = true,
-                        dateSet = null,
-                        notes = null,
-                        createdAt = "2024-01-01T10:00:00Z",
-                        updatedAt = "2024-01-01T10:00:00Z"
-                )
+            BackupProblem(
+                id = "boulder1",
+                gymId = "gym1",
+                name = "Boulder Problem",
+                description = null,
+                climbType = ClimbType.BOULDER,
+                difficulty = DifficultyGrade(DifficultySystem.V_SCALE, "V3"),
+                tags = emptyList(),
+                location = null,
+                imagePaths = null,
+                isActive = true,
+                dateSet = null,
+                notes = null,
+                createdAt = "2024-01-01T10:00:00Z",
+                updatedAt = "2024-01-01T10:00:00Z",
+            )
 
         assertEquals(ClimbType.BOULDER, boulderProblem.climbType)
         assertEquals(DifficultySystem.V_SCALE, boulderProblem.difficulty.system)
 
         // Test that YDS works with ROPE
         val ropeProblem =
-                BackupProblem(
-                        id = "rope1",
-                        gymId = "gym1",
-                        name = "Rope Problem",
-                        description = null,
-                        climbType = ClimbType.ROPE,
-                        difficulty = DifficultyGrade(DifficultySystem.YDS, "5.10a"),
-                        tags = emptyList(),
-                        location = null,
-                        imagePaths = null,
-                        isActive = true,
-                        dateSet = null,
-                        notes = null,
-                        createdAt = "2024-01-01T10:00:00Z",
-                        updatedAt = "2024-01-01T10:00:00Z"
-                )
+            BackupProblem(
+                id = "rope1",
+                gymId = "gym1",
+                name = "Rope Problem",
+                description = null,
+                climbType = ClimbType.ROPE,
+                difficulty = DifficultyGrade(DifficultySystem.YDS, "5.10a"),
+                tags = emptyList(),
+                location = null,
+                imagePaths = null,
+                isActive = true,
+                dateSet = null,
+                notes = null,
+                createdAt = "2024-01-01T10:00:00Z",
+                updatedAt = "2024-01-01T10:00:00Z",
+            )
 
         assertEquals(ClimbType.ROPE, ropeProblem.climbType)
         assertEquals(DifficultySystem.YDS, ropeProblem.difficulty.system)
@@ -473,12 +473,12 @@ class DataModelTests {
     @Test
     fun testAttemptResultValidation() {
         val validResults =
-                listOf(
-                        AttemptResult.SUCCESS,
-                        AttemptResult.FALL,
-                        AttemptResult.NO_PROGRESS,
-                        AttemptResult.FLASH
-                )
+            listOf(
+                AttemptResult.SUCCESS,
+                AttemptResult.FALL,
+                AttemptResult.NO_PROGRESS,
+                AttemptResult.FLASH,
+            )
 
         assertEquals(4, validResults.size)
         assertTrue(validResults.contains(AttemptResult.SUCCESS))
@@ -490,7 +490,7 @@ class DataModelTests {
     @Test
     fun testSessionStatusValidation() {
         val validStatuses =
-                listOf(SessionStatus.ACTIVE, SessionStatus.COMPLETED, SessionStatus.PAUSED)
+            listOf(SessionStatus.ACTIVE, SessionStatus.COMPLETED, SessionStatus.PAUSED)
 
         assertEquals(3, validStatuses.size)
         assertTrue(validStatuses.contains(SessionStatus.ACTIVE))
@@ -501,64 +501,64 @@ class DataModelTests {
     @Test
     fun testClimbDataIntegrity() {
         val gym =
-                BackupGym(
-                        id = "gym1",
-                        name = "Test Gym",
-                        location = "Test City",
-                        supportedClimbTypes = listOf(ClimbType.BOULDER),
-                        difficultySystems = listOf(DifficultySystem.V_SCALE),
-                        customDifficultyGrades = emptyList(),
-                        notes = null,
-                        createdAt = "2024-01-01T10:00:00Z",
-                        updatedAt = "2024-01-01T10:00:00Z"
-                )
+            BackupGym(
+                id = "gym1",
+                name = "Test Gym",
+                location = "Test City",
+                supportedClimbTypes = listOf(ClimbType.BOULDER),
+                difficultySystems = listOf(DifficultySystem.V_SCALE),
+                customDifficultyGrades = emptyList(),
+                notes = null,
+                createdAt = "2024-01-01T10:00:00Z",
+                updatedAt = "2024-01-01T10:00:00Z",
+            )
 
         val problem =
-                BackupProblem(
-                        id = "problem1",
-                        gymId = gym.id,
-                        name = "Test Problem",
-                        description = null,
-                        climbType = ClimbType.BOULDER,
-                        difficulty = DifficultyGrade(DifficultySystem.V_SCALE, "V3"),
-                        tags = emptyList(),
-                        location = null,
-                        imagePaths = null,
-                        isActive = true,
-                        dateSet = null,
-                        notes = null,
-                        createdAt = "2024-01-01T10:00:00Z",
-                        updatedAt = "2024-01-01T10:00:00Z"
-                )
+            BackupProblem(
+                id = "problem1",
+                gymId = gym.id,
+                name = "Test Problem",
+                description = null,
+                climbType = ClimbType.BOULDER,
+                difficulty = DifficultyGrade(DifficultySystem.V_SCALE, "V3"),
+                tags = emptyList(),
+                location = null,
+                imagePaths = null,
+                isActive = true,
+                dateSet = null,
+                notes = null,
+                createdAt = "2024-01-01T10:00:00Z",
+                updatedAt = "2024-01-01T10:00:00Z",
+            )
 
         val session =
-                BackupClimbSession(
-                        id = "session1",
-                        gymId = gym.id,
-                        date = "2024-01-01",
-                        startTime = "2024-01-01T10:00:00Z",
-                        endTime = "2024-01-01T11:00:00Z",
-                        duration = 3600,
-                        status = SessionStatus.COMPLETED,
-                        notes = null,
-                        createdAt = "2024-01-01T10:00:00Z",
-                        updatedAt = "2024-01-01T11:00:00Z"
-                )
+            BackupClimbSession(
+                id = "session1",
+                gymId = gym.id,
+                date = "2024-01-01",
+                startTime = "2024-01-01T10:00:00Z",
+                endTime = "2024-01-01T11:00:00Z",
+                duration = 3600,
+                status = SessionStatus.COMPLETED,
+                notes = null,
+                createdAt = "2024-01-01T10:00:00Z",
+                updatedAt = "2024-01-01T11:00:00Z",
+            )
 
         val attempt =
-                BackupAttempt(
-                        id = "attempt1",
-                        sessionId = session.id,
-                        problemId = problem.id,
-                        result = AttemptResult.SUCCESS,
-                        highestHold = null,
-                        notes = null,
-                        duration = 120,
-                        restTime = null,
-                        timestamp = "2024-01-01T10:30:00Z",
-                        createdAt = "2024-01-01T10:30:00Z",
-                        updatedAt = "2024-01-01T10:30:00Z"
-                )
+            BackupAttempt(
+                id = "attempt1",
+                sessionId = session.id,
+                problemId = problem.id,
+                result = AttemptResult.SUCCESS,
+                highestHold = null,
+                notes = null,
+                duration = 120,
+                restTime = null,
+                timestamp = "2024-01-01T10:30:00Z",
+                createdAt = "2024-01-01T10:30:00Z",
+                updatedAt = "2024-01-01T10:30:00Z",
+            )
 
         // Verify referential integrity
         assertEquals(gym.id, problem.gymId)

android/app/src/test/java/com/atridad/openclimb/SyncMergeLogicTest.kt

@@ -11,197 +11,197 @@ class SyncMergeLogicTest {
     fun `test intelligent merge preserves all data`() {
         // Create local data
         val localGyms =
-                listOf(
-                        BackupGym(
-                                id = "gym1",
-                                name = "Local Gym 1",
-                                location = "Local Location",
-                                supportedClimbTypes = listOf(ClimbType.BOULDER),
-                                difficultySystems = listOf(DifficultySystem.V_SCALE),
-                                customDifficultyGrades = emptyList(),
-                                notes = null,
-                                createdAt = "2024-01-01T10:00:00",
-                                updatedAt = "2024-01-01T10:00:00"
-                        )
-                )
+            listOf(
+                BackupGym(
+                    id = "gym1",
+                    name = "Local Gym 1",
+                    location = "Local Location",
+                    supportedClimbTypes = listOf(ClimbType.BOULDER),
+                    difficultySystems = listOf(DifficultySystem.V_SCALE),
+                    customDifficultyGrades = emptyList(),
+                    notes = null,
+                    createdAt = "2024-01-01T10:00:00",
+                    updatedAt = "2024-01-01T10:00:00",
+                ),
+            )
 
         val localProblems =
-                listOf(
-                        BackupProblem(
-                                id = "problem1",
-                                gymId = "gym1",
-                                name = "Local Problem",
-                                description = "Local description",
-                                climbType = ClimbType.BOULDER,
-                                difficulty = DifficultyGrade(DifficultySystem.V_SCALE, "V5"),
-                                tags = listOf("local"),
-                                location = null,
-                                imagePaths = listOf("local_image.jpg"),
-                                isActive = true,
-                                dateSet = null,
-                                notes = null,
-                                createdAt = "2024-01-01T10:00:00",
-                                updatedAt = "2024-01-01T10:00:00"
-                        )
-                )
+            listOf(
+                BackupProblem(
+                    id = "problem1",
+                    gymId = "gym1",
+                    name = "Local Problem",
+                    description = "Local description",
+                    climbType = ClimbType.BOULDER,
+                    difficulty = DifficultyGrade(DifficultySystem.V_SCALE, "V5"),
+                    tags = listOf("local"),
+                    location = null,
+                    imagePaths = listOf("local_image.jpg"),
+                    isActive = true,
+                    dateSet = null,
+                    notes = null,
+                    createdAt = "2024-01-01T10:00:00",
+                    updatedAt = "2024-01-01T10:00:00",
+                ),
+            )
 
         val localSessions =
-                listOf(
-                        BackupClimbSession(
-                                id = "session1",
-                                gymId = "gym1",
-                                date = "2024-01-01",
-                                startTime = "2024-01-01T10:00:00",
-                                endTime = "2024-01-01T12:00:00",
-                                duration = 7200,
-                                status = SessionStatus.COMPLETED,
-                                notes = null,
-                                createdAt = "2024-01-01T10:00:00",
-                                updatedAt = "2024-01-01T10:00:00"
-                        )
-                )
+            listOf(
+                BackupClimbSession(
+                    id = "session1",
+                    gymId = "gym1",
+                    date = "2024-01-01",
+                    startTime = "2024-01-01T10:00:00",
+                    endTime = "2024-01-01T12:00:00",
+                    duration = 7200,
+                    status = SessionStatus.COMPLETED,
+                    notes = null,
+                    createdAt = "2024-01-01T10:00:00",
+                    updatedAt = "2024-01-01T10:00:00",
+                ),
+            )
 
         val localAttempts =
-                listOf(
-                        BackupAttempt(
-                                id = "attempt1",
-                                sessionId = "session1",
-                                problemId = "problem1",
-                                result = AttemptResult.SUCCESS,
-                                highestHold = null,
-                                notes = null,
-                                duration = 300,
-                                restTime = null,
-                                timestamp = "2024-01-01T10:30:00",
-                                createdAt = "2024-01-01T10:30:00",
-                                updatedAt = "2024-01-01T10:30:00"
-                        )
-                )
+            listOf(
+                BackupAttempt(
+                    id = "attempt1",
+                    sessionId = "session1",
+                    problemId = "problem1",
+                    result = AttemptResult.SUCCESS,
+                    highestHold = null,
+                    notes = null,
+                    duration = 300,
+                    restTime = null,
+                    timestamp = "2024-01-01T10:30:00",
+                    createdAt = "2024-01-01T10:30:00",
+                    updatedAt = "2024-01-01T10:30:00",
+                ),
+            )
 
         val localBackup =
-                ClimbDataBackup(
-                        exportedAt = "2024-01-01T10:00:00",
-                        version = "2.0",
-                        formatVersion = "2.0",
-                        gyms = localGyms,
-                        problems = localProblems,
-                        sessions = localSessions,
-                        attempts = localAttempts
-                )
+            ClimbDataBackup(
+                exportedAt = "2024-01-01T10:00:00",
+                version = "2.0",
+                formatVersion = "2.0",
+                gyms = localGyms,
+                problems = localProblems,
+                sessions = localSessions,
+                attempts = localAttempts,
+            )
 
         // Create server data with some overlapping and some unique data
         val serverGyms =
-                listOf(
-                        // Same gym but with newer update
-                        BackupGym(
-                                id = "gym1",
-                                name = "Updated Gym 1",
-                                location = "Updated Location",
-                                supportedClimbTypes = listOf(ClimbType.BOULDER, ClimbType.ROPE),
-                                difficultySystems =
-                                        listOf(DifficultySystem.V_SCALE, DifficultySystem.YDS),
-                                customDifficultyGrades = emptyList(),
-                                notes = "Updated notes",
-                                createdAt = "2024-01-01T10:00:00",
-                                updatedAt = "2024-01-01T12:00:00" // Newer update
-                        ),
-                        // Unique server gym
-                        BackupGym(
-                                id = "gym2",
-                                name = "Server Gym 2",
-                                location = "Server Location",
-                                supportedClimbTypes = listOf(ClimbType.ROPE),
-                                difficultySystems = listOf(DifficultySystem.YDS),
-                                customDifficultyGrades = emptyList(),
-                                notes = null,
-                                createdAt = "2024-01-01T11:00:00",
-                                updatedAt = "2024-01-01T11:00:00"
-                        )
-                )
+            listOf(
+                // Same gym but with newer update
+                BackupGym(
+                    id = "gym1",
+                    name = "Updated Gym 1",
+                    location = "Updated Location",
+                    supportedClimbTypes = listOf(ClimbType.BOULDER, ClimbType.ROPE),
+                    difficultySystems =
+                    listOf(DifficultySystem.V_SCALE, DifficultySystem.YDS),
+                    customDifficultyGrades = emptyList(),
+                    notes = "Updated notes",
+                    createdAt = "2024-01-01T10:00:00",
+                    updatedAt = "2024-01-01T12:00:00", // Newer update
+                ),
+                // Unique server gym
+                BackupGym(
+                    id = "gym2",
+                    name = "Server Gym 2",
+                    location = "Server Location",
+                    supportedClimbTypes = listOf(ClimbType.ROPE),
+                    difficultySystems = listOf(DifficultySystem.YDS),
+                    customDifficultyGrades = emptyList(),
+                    notes = null,
+                    createdAt = "2024-01-01T11:00:00",
+                    updatedAt = "2024-01-01T11:00:00",
+                ),
+            )
 
         val serverProblems =
-                listOf(
-                        // Same problem but with newer update and different images
-                        BackupProblem(
-                                id = "problem1",
-                                gymId = "gym1",
-                                name = "Updated Problem",
-                                description = "Updated description",
-                                climbType = ClimbType.BOULDER,
-                                difficulty = DifficultyGrade(DifficultySystem.V_SCALE, "V5"),
-                                tags = listOf("updated", "server"),
-                                location = "Updated location",
-                                imagePaths = listOf("server_image.jpg"),
-                                isActive = true,
-                                dateSet = "2024-01-01",
-                                notes = "Updated notes",
-                                createdAt = "2024-01-01T10:00:00",
-                                updatedAt = "2024-01-01T11:00:00" // Newer update
-                        ),
-                        // Unique server problem
-                        BackupProblem(
-                                id = "problem2",
-                                gymId = "gym2",
-                                name = "Server Problem",
-                                description = "Server description",
-                                climbType = ClimbType.ROPE,
-                                difficulty = DifficultyGrade(DifficultySystem.YDS, "5.10a"),
-                                tags = listOf("server"),
-                                location = null,
-                                imagePaths = null,
-                                isActive = true,
-                                dateSet = null,
-                                notes = null,
-                                createdAt = "2024-01-01T11:00:00",
-                                updatedAt = "2024-01-01T11:00:00"
-                        )
-                )
+            listOf(
+                // Same problem but with newer update and different images
+                BackupProblem(
+                    id = "problem1",
+                    gymId = "gym1",
+                    name = "Updated Problem",
+                    description = "Updated description",
+                    climbType = ClimbType.BOULDER,
+                    difficulty = DifficultyGrade(DifficultySystem.V_SCALE, "V5"),
+                    tags = listOf("updated", "server"),
+                    location = "Updated location",
+                    imagePaths = listOf("server_image.jpg"),
+                    isActive = true,
+                    dateSet = "2024-01-01",
+                    notes = "Updated notes",
+                    createdAt = "2024-01-01T10:00:00",
+                    updatedAt = "2024-01-01T11:00:00", // Newer update
+                ),
+                // Unique server problem
+                BackupProblem(
+                    id = "problem2",
+                    gymId = "gym2",
+                    name = "Server Problem",
+                    description = "Server description",
+                    climbType = ClimbType.ROPE,
+                    difficulty = DifficultyGrade(DifficultySystem.YDS, "5.10a"),
+                    tags = listOf("server"),
+                    location = null,
+                    imagePaths = null,
+                    isActive = true,
+                    dateSet = null,
+                    notes = null,
+                    createdAt = "2024-01-01T11:00:00",
+                    updatedAt = "2024-01-01T11:00:00",
+                ),
+            )
 
         val serverSessions =
-                listOf(
-                        // Unique server session
-                        BackupClimbSession(
-                                id = "session2",
-                                gymId = "gym2",
-                                date = "2024-01-02",
-                                startTime = "2024-01-02T14:00:00",
-                                endTime = "2024-01-02T16:00:00",
-                                duration = 7200,
-                                status = SessionStatus.COMPLETED,
-                                notes = "Server session",
-                                createdAt = "2024-01-02T14:00:00",
-                                updatedAt = "2024-01-02T14:00:00"
-                        )
-                )
+            listOf(
+                // Unique server session
+                BackupClimbSession(
+                    id = "session2",
+                    gymId = "gym2",
+                    date = "2024-01-02",
+                    startTime = "2024-01-02T14:00:00",
+                    endTime = "2024-01-02T16:00:00",
+                    duration = 7200,
+                    status = SessionStatus.COMPLETED,
+                    notes = "Server session",
+                    createdAt = "2024-01-02T14:00:00",
+                    updatedAt = "2024-01-02T14:00:00",
+                ),
+            )
 
         val serverAttempts =
-                listOf(
-                        // Unique server attempt
-                        BackupAttempt(
-                                id = "attempt2",
-                                sessionId = "session2",
-                                problemId = "problem2",
-                                result = AttemptResult.FALL,
-                                highestHold = "Last move",
-                                notes = "Almost had it",
-                                duration = 180,
-                                restTime = 60,
-                                timestamp = "2024-01-02T14:30:00",
-                                createdAt = "2024-01-02T14:30:00",
-                                updatedAt = "2024-01-02T14:30:00"
-                        )
-                )
+            listOf(
+                // Unique server attempt
+                BackupAttempt(
+                    id = "attempt2",
+                    sessionId = "session2",
+                    problemId = "problem2",
+                    result = AttemptResult.FALL,
+                    highestHold = "Last move",
+                    notes = "Almost had it",
+                    duration = 180,
+                    restTime = 60,
+                    timestamp = "2024-01-02T14:30:00",
+                    createdAt = "2024-01-02T14:30:00",
+                    updatedAt = "2024-01-02T14:30:00",
+                ),
+            )
 
         val serverBackup =
-                ClimbDataBackup(
-                        exportedAt = "2024-01-01T12:00:00",
-                        version = "2.0",
-                        formatVersion = "2.0",
-                        gyms = serverGyms,
-                        problems = serverProblems,
-                        sessions = serverSessions,
-                        attempts = serverAttempts
-                )
+            ClimbDataBackup(
+                exportedAt = "2024-01-01T12:00:00",
+                version = "2.0",
+                formatVersion = "2.0",
+                gyms = serverGyms,
+                problems = serverProblems,
+                sessions = serverSessions,
+                attempts = serverAttempts,
+            )
 
         // Simulate merge logic
         val mergedBackup = performIntelligentMerge(localBackup, serverBackup)
@@ -231,12 +231,12 @@ class SyncMergeLogicTest {
 
         // Images should be merged (both local and server images preserved)
         assertTrue(
-                "Should contain local image",
-                mergedProblem1.imagePaths!!.contains("local_image.jpg")
+            "Should contain local image",
+            mergedProblem1.imagePaths!!.contains("local_image.jpg"),
         )
         assertTrue(
-                "Should contain server image",
-                mergedProblem1.imagePaths!!.contains("server_image.jpg")
+            "Should contain server image",
+            mergedProblem1.imagePaths!!.contains("server_image.jpg"),
         )
         assertEquals("Should have 2 images total", 2, mergedProblem1.imagePaths!!.size)
 
@@ -246,78 +246,78 @@ class SyncMergeLogicTest {
 
         // Verify all sessions are preserved
         assertTrue(
-                "Should contain local session",
-                mergedBackup.sessions.any { it.id == "session1" }
+            "Should contain local session",
+            mergedBackup.sessions.any { it.id == "session1" },
         )
         assertTrue(
-                "Should contain server session",
-                mergedBackup.sessions.any { it.id == "session2" }
+            "Should contain server session",
+            mergedBackup.sessions.any { it.id == "session2" },
         )
 
         // Verify all attempts are preserved
         assertTrue(
-                "Should contain local attempt",
-                mergedBackup.attempts.any { it.id == "attempt1" }
+            "Should contain local attempt",
+            mergedBackup.attempts.any { it.id == "attempt1" },
         )
         assertTrue(
-                "Should contain server attempt",
-                mergedBackup.attempts.any { it.id == "attempt2" }
+            "Should contain server attempt",
+            mergedBackup.attempts.any { it.id == "attempt2" },
         )
     }
 
     @Test
     fun `test date comparison logic`() {
         assertTrue(
-                "ISO instant should be newer",
-                isNewerThan("2024-01-01T12:00:00Z", "2024-01-01T10:00:00Z")
+            "ISO instant should be newer",
+            isNewerThan("2024-01-01T12:00:00Z", "2024-01-01T10:00:00Z"),
         )
         assertFalse(
-                "ISO instant should be older",
-                isNewerThan("2024-01-01T10:00:00Z", "2024-01-01T12:00:00Z")
+            "ISO instant should be older",
+            isNewerThan("2024-01-01T10:00:00Z", "2024-01-01T12:00:00Z"),
         )
         assertTrue(
-                "String comparison should work as fallback",
-                isNewerThan("2024-01-02T10:00:00", "2024-01-01T10:00:00")
+            "String comparison should work as fallback",
+            isNewerThan("2024-01-02T10:00:00", "2024-01-01T10:00:00"),
         )
     }
 
     @Test
     fun `test empty data scenarios`() {
         val emptyBackup =
-                ClimbDataBackup(
-                        exportedAt = "2024-01-01T10:00:00",
-                        version = "2.0",
-                        formatVersion = "2.0",
-                        gyms = emptyList(),
-                        problems = emptyList(),
-                        sessions = emptyList(),
-                        attempts = emptyList()
-                )
+            ClimbDataBackup(
+                exportedAt = "2024-01-01T10:00:00",
+                version = "2.0",
+                formatVersion = "2.0",
+                gyms = emptyList(),
+                problems = emptyList(),
+                sessions = emptyList(),
+                attempts = emptyList(),
+            )
 
         val dataBackup =
-                ClimbDataBackup(
-                        exportedAt = "2024-01-01T10:00:00",
-                        version = "2.0",
-                        formatVersion = "2.0",
-                        gyms =
-                                listOf(
-                                        BackupGym(
-                                                id = "gym1",
-                                                name = "Test Gym",
-                                                location = null,
-                                                supportedClimbTypes = listOf(ClimbType.BOULDER),
-                                                difficultySystems =
-                                                        listOf(DifficultySystem.V_SCALE),
-                                                customDifficultyGrades = emptyList(),
-                                                notes = null,
-                                                createdAt = "2024-01-01T10:00:00",
-                                                updatedAt = "2024-01-01T10:00:00"
-                                        )
-                                ),
-                        problems = emptyList(),
-                        sessions = emptyList(),
-                        attempts = emptyList()
-                )
+            ClimbDataBackup(
+                exportedAt = "2024-01-01T10:00:00",
+                version = "2.0",
+                formatVersion = "2.0",
+                gyms =
+                listOf(
+                    BackupGym(
+                        id = "gym1",
+                        name = "Test Gym",
+                        location = null,
+                        supportedClimbTypes = listOf(ClimbType.BOULDER),
+                        difficultySystems =
+                        listOf(DifficultySystem.V_SCALE),
+                        customDifficultyGrades = emptyList(),
+                        notes = null,
+                        createdAt = "2024-01-01T10:00:00",
+                        updatedAt = "2024-01-01T10:00:00",
+                    ),
+                ),
+                problems = emptyList(),
+                sessions = emptyList(),
+                attempts = emptyList(),
+            )
 
         // Test merging empty with data
         val merged1 = performIntelligentMerge(emptyBackup, dataBackup)
@@ -334,8 +334,8 @@ class SyncMergeLogicTest {
 
     // Helper methods that simulate the merge logic from SyncService
     private fun performIntelligentMerge(
-            local: ClimbDataBackup,
-            server: ClimbDataBackup
+        local: ClimbDataBackup,
+        server: ClimbDataBackup,
     ): ClimbDataBackup {
         val mergedGyms = mergeGyms(local.gyms, server.gyms)
         val mergedProblems = mergeProblems(local.problems, server.problems)
@@ -343,13 +343,13 @@ class SyncMergeLogicTest {
         val mergedAttempts = mergeAttempts(local.attempts, server.attempts)
 
         return ClimbDataBackup(
-                exportedAt = "2024-01-01T12:00:00",
-                version = "2.0",
-                formatVersion = "2.0",
-                gyms = mergedGyms,
-                problems = mergedProblems,
-                sessions = mergedSessions,
-                attempts = mergedAttempts
+            exportedAt = "2024-01-01T12:00:00",
+            version = "2.0",
+            formatVersion = "2.0",
+            gyms = mergedGyms,
+            problems = mergedProblems,
+            sessions = mergedSessions,
+            attempts = mergedAttempts,
         )
     }
 
@@ -371,8 +371,8 @@ class SyncMergeLogicTest {
     }
 
     private fun mergeProblems(
-            local: List<BackupProblem>,
-            server: List<BackupProblem>
+        local: List<BackupProblem>,
+        server: List<BackupProblem>,
     ): List<BackupProblem> {
         val merged = mutableMapOf<String, BackupProblem>()
 
@@ -390,7 +390,7 @@ class SyncMergeLogicTest {
                 serverProblem.imagePaths?.let { allImagePaths.addAll(it) }
 
                 merged[serverProblem.id] =
-                        serverProblem.withUpdatedImagePaths(allImagePaths.toList())
+                    serverProblem.withUpdatedImagePaths(allImagePaths.toList())
             }
         }
 
@@ -398,8 +398,8 @@ class SyncMergeLogicTest {
     }
 
     private fun mergeSessions(
-            local: List<BackupClimbSession>,
-            server: List<BackupClimbSession>
+        local: List<BackupClimbSession>,
+        server: List<BackupClimbSession>,
     ): List<BackupClimbSession> {
         val merged = mutableMapOf<String, BackupClimbSession>()
 
@@ -419,8 +419,8 @@ class SyncMergeLogicTest {
     }
 
     private fun mergeAttempts(
-            local: List<BackupAttempt>,
-            server: List<BackupAttempt>
+        local: List<BackupAttempt>,
+        server: List<BackupAttempt>,
     ): List<BackupAttempt> {
         val merged = mutableMapOf<String, BackupAttempt>()
 
@@ -431,10 +431,10 @@ class SyncMergeLogicTest {
         server.forEach { serverAttempt ->
             val localAttempt = merged[serverAttempt.id]
             if (localAttempt == null ||
-                            isNewerThan(
-                                    serverAttempt.updatedAt ?: serverAttempt.createdAt,
-                                    localAttempt.updatedAt ?: localAttempt.createdAt
-                            )
+                isNewerThan(
+                    serverAttempt.updatedAt ?: serverAttempt.createdAt,
+                    localAttempt.updatedAt ?: localAttempt.createdAt,
+                )
             ) {
                 merged[serverAttempt.id] = serverAttempt
             }
@@ -458,32 +458,32 @@ class SyncMergeLogicTest {
     @Test
     fun `test active sessions excluded from sync`() {
         val allLocalSessions =
-                listOf(
-                        BackupClimbSession(
-                                id = "active_session_1",
-                                gymId = "gym1",
-                                date = "2024-01-01",
-                                startTime = "2024-01-01T10:00:00",
-                                endTime = null,
-                                duration = null,
-                                status = SessionStatus.ACTIVE,
-                                notes = null,
-                                createdAt = "2024-01-01T10:00:00",
-                                updatedAt = "2024-01-01T10:00:00"
-                        ),
-                        BackupClimbSession(
-                                id = "completed_session_1",
-                                gymId = "gym1",
-                                date = "2023-12-31",
-                                startTime = "2023-12-31T15:00:00",
-                                endTime = "2023-12-31T17:00:00",
-                                duration = 7200000,
-                                status = SessionStatus.COMPLETED,
-                                notes = "Previous session",
-                                createdAt = "2023-12-31T15:00:00",
-                                updatedAt = "2023-12-31T17:00:00"
-                        )
-                )
+            listOf(
+                BackupClimbSession(
+                    id = "active_session_1",
+                    gymId = "gym1",
+                    date = "2024-01-01",
+                    startTime = "2024-01-01T10:00:00",
+                    endTime = null,
+                    duration = null,
+                    status = SessionStatus.ACTIVE,
+                    notes = null,
+                    createdAt = "2024-01-01T10:00:00",
+                    updatedAt = "2024-01-01T10:00:00",
+                ),
+                BackupClimbSession(
+                    id = "completed_session_1",
+                    gymId = "gym1",
+                    date = "2023-12-31",
+                    startTime = "2023-12-31T15:00:00",
+                    endTime = "2023-12-31T17:00:00",
+                    duration = 7200000,
+                    status = SessionStatus.COMPLETED,
+                    notes = "Previous session",
+                    createdAt = "2023-12-31T15:00:00",
+                    updatedAt = "2023-12-31T17:00:00",
+                ),
+            )
 
         // Simulate filtering that would happen in createBackupFromRepository
         val sessionsForSync = allLocalSessions.filter { it.status != SessionStatus.ACTIVE }
@@ -493,18 +493,18 @@ class SyncMergeLogicTest {
 
         // Active session should be excluded
         assertFalse(
-                "Should not contain active session in sync",
-                sessionsForSync.any {
-                    it.id == "active_session_1" && it.status == SessionStatus.ACTIVE
-                }
+            "Should not contain active session in sync",
+            sessionsForSync.any {
+                it.id == "active_session_1" && it.status == SessionStatus.ACTIVE
+            },
         )
 
         // Completed session should be included
         assertTrue(
-                "Should contain completed session in sync",
-                sessionsForSync.any {
-                    it.id == "completed_session_1" && it.status == SessionStatus.COMPLETED
-                }
+            "Should contain completed session in sync",
+            sessionsForSync.any {
+                it.id == "completed_session_1" && it.status == SessionStatus.COMPLETED
+            },
         )
     }
 }

android/app/src/test/java/com/atridad/openclimb/UtilityTests.kt

@@ -1,10 +1,10 @@
 package com.atridad.ascently
 
+import org.junit.Assert.*
+import org.junit.Test
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 import java.util.concurrent.TimeUnit
-import org.junit.Assert.*
-import org.junit.Test
 
 class UtilityTests {
 
@@ -75,13 +75,13 @@ class UtilityTests {
     @Test
     fun testClimbingStatistics() {
         val attempts =
-                listOf(
-                        AttemptData("SUCCESS", 120),
-                        AttemptData("FALL", 90),
-                        AttemptData("SUCCESS", 150),
-                        AttemptData("FLASH", 60),
-                        AttemptData("FALL", 110)
-                )
+            listOf(
+                AttemptData("SUCCESS", 120),
+                AttemptData("FALL", 90),
+                AttemptData("SUCCESS", 150),
+                AttemptData("FLASH", 60),
+                AttemptData("FALL", 110),
+            )
 
         val stats = calculateAttemptStatistics(attempts)
 
@@ -163,23 +163,23 @@ class UtilityTests {
     @Test
     fun testSearchFiltering() {
         val problems =
-                listOf(
-                        ProblemData(
-                                "id1",
-                                "Crimpy Problem",
-                                "BOULDER",
-                                "V5",
-                                listOf("crimpy", "overhang")
-                        ),
-                        ProblemData("id2", "Easy Route", "ROPE", "5.6", listOf("beginner", "slab")),
-                        ProblemData(
-                                "id3",
-                                "Hard Boulder",
-                                "BOULDER",
-                                "V10",
-                                listOf("powerful", "roof")
-                        )
-                )
+            listOf(
+                ProblemData(
+                    "id1",
+                    "Crimpy Problem",
+                    "BOULDER",
+                    "V5",
+                    listOf("crimpy", "overhang"),
+                ),
+                ProblemData("id2", "Easy Route", "ROPE", "5.6", listOf("beginner", "slab")),
+                ProblemData(
+                    "id3",
+                    "Hard Boulder",
+                    "BOULDER",
+                    "V10",
+                    listOf("powerful", "roof"),
+                ),
+            )
 
         val boulderProblems = filterByClimbType(problems, "BOULDER")
         assertEquals(2, boulderProblems.size)
@@ -207,20 +207,20 @@ class UtilityTests {
     @Test
     fun testBackupValidation() {
         val validBackup =
-                BackupData(
-                        version = "2.0",
-                        formatVersion = "2.0",
-                        exportedAt = "2024-01-01T10:00:00Z",
-                        dataCount = 5
-                )
+            BackupData(
+                version = "2.0",
+                formatVersion = "2.0",
+                exportedAt = "2024-01-01T10:00:00Z",
+                dataCount = 5,
+            )
 
         val invalidBackup =
-                BackupData(
-                        version = "1.0",
-                        formatVersion = "2.0",
-                        exportedAt = "invalid-date",
-                        dataCount = -1
-                )
+            BackupData(
+                version = "1.0",
+                formatVersion = "2.0",
+                exportedAt = "invalid-date",
+                dataCount = -1,
+            )
 
         assertTrue(isValidBackup(validBackup))
         assertFalse(isValidBackup(invalidBackup))
@@ -258,10 +258,10 @@ class UtilityTests {
         val successRate = (successful.toDouble() / attempts.size) * 100
 
         return AttemptStatistics(
-                totalAttempts = attempts.size,
-                successfulAttempts = successful,
-                successRate = successRate,
-                averageDuration = avgDuration
+            totalAttempts = attempts.size,
+            successfulAttempts = successful,
+            successRate = successRate,
+            averageDuration = avgDuration,
         )
     }
 
@@ -301,8 +301,8 @@ class UtilityTests {
     }
 
     private fun filterByClimbType(
-            problems: List<ProblemData>,
-            climbType: String
+        problems: List<ProblemData>,
+        climbType: String,
     ): List<ProblemData> {
         return problems.filter { it.climbType == climbType }
     }
@@ -312,9 +312,9 @@ class UtilityTests {
     }
 
     private fun filterByDifficultyRange(
-            problems: List<ProblemData>,
-            minGrade: String,
-            maxGrade: String
+        problems: List<ProblemData>,
+        minGrade: String,
+        maxGrade: String,
     ): List<ProblemData> {
         return problems.filter { problem ->
             if (problem.climbType == "BOULDER" && problem.difficulty.startsWith("V")) {
@@ -329,17 +329,17 @@ class UtilityTests {
     }
 
     private fun mergeData(
-            local: Map<String, String>,
-            server: Map<String, String>
+        local: Map<String, String>,
+        server: Map<String, String>,
     ): Map<String, String> {
         return (local.keys + server.keys).associateWith { key -> server[key] ?: local[key]!! }
     }
 
     private fun isValidBackup(backup: BackupData): Boolean {
         return backup.version == "2.0" &&
-                backup.formatVersion == "2.0" &&
-                backup.exportedAt.matches(Regex("\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}Z")) &&
-                backup.dataCount >= 0
+            backup.formatVersion == "2.0" &&
+            backup.exportedAt.matches(Regex("\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}Z")) &&
+            backup.dataCount >= 0
     }
 
     // Data classes for testing
@@ -347,24 +347,24 @@ class UtilityTests {
     data class AttemptData(val result: String, val duration: Int)
 
     data class AttemptStatistics(
-            val totalAttempts: Int,
-            val successfulAttempts: Int,
-            val successRate: Double,
-            val averageDuration: Double
+        val totalAttempts: Int,
+        val successfulAttempts: Int,
+        val successRate: Double,
+        val averageDuration: Double,
     )
 
     data class ProblemData(
-            val id: String,
-            val name: String,
-            val climbType: String,
-            val difficulty: String,
-            val tags: List<String>
+        val id: String,
+        val name: String,
+        val climbType: String,
+        val difficulty: String,
+        val tags: List<String>,
     )
 
     data class BackupData(
-            val version: String,
-            val formatVersion: String,
-            val exportedAt: String,
-            val dataCount: Int
+        val version: String,
+        val formatVersion: String,
+        val exportedAt: String,
+        val dataCount: Int,
     )
 }

android/build.gradle.kts

@@ -3,4 +3,6 @@ plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.compose) apply false
+    alias(libs.plugins.detekt) apply false
+    alias(libs.plugins.spotless) apply false
 }

android/detekt.yml

@@ -0,0 +1,584 @@
+build:
+  maxIssues: -1
+  excludeCorrectable: false
+
+config:
+  validation: true
+  warningsAsErrors: false
+
+processors:
+  active: true
+  exclude:
+    - 'DetektProgressListener'
+
+console-reports:
+  active: true
+
+output-reports:
+  active: true
+  exclude:
+    - 'TxtOutputReport'
+
+complexity:
+  active: true
+  ComplexCondition:
+    active: true
+    threshold: 5
+  CyclomaticComplexMethod:
+    active: true
+    threshold: 50
+    ignoreSingleWhenExpression: true
+    ignoreSimpleWhenEntries: true
+    ignoreNestingFunctions: false
+    nestingFunctions:
+      - 'also'
+      - 'apply'
+      - 'let'
+      - 'run'
+      - 'with'
+  LabeledExpression:
+    active: false
+  LargeClass:
+    active: true
+    threshold: 800
+  LongMethod:
+    active: true
+    threshold: 120
+    ignoreAnnotated:
+      - 'Composable'
+      - 'Test'
+  LongParameterList:
+    active: true
+    functionThreshold: 15
+    constructorThreshold: 15
+    ignoreDefaultParameters: true
+    ignoreDataClasses: true
+    ignoreAnnotatedParameter:
+      - 'Composable'
+  MethodOverloading:
+    active: false
+  NamedArguments:
+    active: false
+  NestedBlockDepth:
+    active: true
+    threshold: 8
+  NestedScopeFunctions:
+    active: true
+    threshold: 2
+    functions:
+      - 'also'
+      - 'apply'
+      - 'let'
+      - 'run'
+      - 'with'
+  ReplaceSafeCallChainWithRun:
+    active: false
+  StringLiteralDuplication:
+    active: false
+    threshold: 4
+    ignoreAnnotation: true
+    excludeStringsWithLessThan5Characters: true
+    ignoreStringsRegex: '$^'
+  TooManyFunctions:
+    active: true
+    thresholdInFiles: 40
+    thresholdInClasses: 40
+    thresholdInInterfaces: 25
+    thresholdInObjects: 25
+    thresholdInEnums: 15
+    ignoreDeprecated: true
+    ignorePrivate: true
+    ignoreOverridden: true
+
+coroutines:
+  active: true
+  GlobalCoroutineUsage:
+    active: true
+  InjectDispatcher:
+    active: true
+    dispatcherNames:
+      - 'IO'
+      - 'Default'
+      - 'Unconfined'
+  RedundantSuspendModifier:
+    active: true
+  SleepInsteadOfDelay:
+    active: true
+  SuspendFunSwallowedCancellation:
+    active: true
+  SuspendFunWithCoroutineScopeReceiver:
+    active: true
+  SuspendFunWithFlowReturnType:
+    active: true
+
+empty-blocks:
+  active: true
+  EmptyCatchBlock:
+    active: true
+    allowedExceptionNameRegex: '_|(ignore|expected).*'
+  EmptyClassBlock:
+    active: true
+  EmptyDefaultConstructor:
+    active: true
+  EmptyDoWhileBlock:
+    active: true
+  EmptyElseBlock:
+    active: true
+  EmptyFinallyBlock:
+    active: true
+  EmptyForBlock:
+    active: true
+  EmptyFunctionBlock:
+    active: true
+    ignoreOverridden: true
+  EmptyIfBlock:
+    active: true
+  EmptyInitBlock:
+    active: true
+  EmptyKtFile:
+    active: true
+  EmptySecondaryConstructor:
+    active: true
+  EmptyTryBlock:
+    active: true
+  EmptyWhenBlock:
+    active: true
+  EmptyWhileBlock:
+    active: true
+
+exceptions:
+  active: true
+  ExceptionRaisedInUnexpectedLocation:
+    active: true
+    methodNames:
+      - 'equals'
+      - 'finalize'
+      - 'hashCode'
+      - 'toString'
+  InstanceOfCheckForException:
+    active: true
+  NotImplementedDeclaration:
+    active: false
+  ObjectExtendsThrowable:
+    active: false
+  PrintStackTrace:
+    active: true
+  RethrowCaughtException:
+    active: true
+  ReturnFromFinally:
+    active: true
+  SwallowedException:
+    active: false
+    ignoredExceptionTypes:
+      - 'InterruptedException'
+      - 'MalformedURLException'
+      - 'NumberFormatException'
+      - 'ParseException'
+    allowedExceptionNameRegex: '_|(ignore|expected).*'
+  ThrowingExceptionFromFinally:
+    active: true
+  ThrowingExceptionInMain:
+    active: false
+  ThrowingExceptionsWithoutMessageOrCause:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/*.Test.kt', '**/*.Spec.kt', '**/*.Spek.kt']
+    exceptions:
+      - 'ArrayIndexOutOfBoundsException'
+      - 'Exception'
+      - 'IllegalArgumentException'
+      - 'IllegalMonitorStateException'
+      - 'IllegalStateException'
+      - 'IndexOutOfBoundsException'
+      - 'NullPointerException'
+      - 'RuntimeException'
+      - 'Throwable'
+  ThrowingNewInstanceOfSameException:
+    active: true
+  TooGenericExceptionCaught:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/*.Test.kt', '**/*.Spec.kt', '**/*.Spek.kt']
+    exceptionNames:
+      - 'ArrayIndexOutOfBoundsException'
+      - 'Error'
+      - 'Exception'
+      - 'IllegalMonitorStateException'
+      - 'IndexOutOfBoundsException'
+      - 'NullPointerException'
+      - 'RuntimeException'
+      - 'Throwable'
+    allowedExceptionNameRegex: '_|(ignore|expected).*'
+  TooGenericExceptionThrown:
+    active: false
+    exceptionNames:
+      - 'Error'
+      - 'Exception'
+      - 'RuntimeException'
+      - 'Throwable'
+
+naming:
+  active: true
+  BooleanPropertyNaming:
+    active: true
+    allowedPattern: '^(is|has|are|should|can|will|does|did)'
+  ClassNaming:
+    active: true
+    classPattern: '[A-Z][a-zA-Z0-9]*'
+  ConstructorParameterNaming:
+    active: true
+    parameterPattern: '[a-z][A-Za-z0-9]*'
+    privateParameterPattern: '[a-z][A-Za-z0-9]*'
+    excludeClassPattern: '$^'
+  EnumNaming:
+    active: true
+    enumEntryPattern: '[A-Z][_a-zA-Z0-9]*'
+  ForbiddenClassName:
+    active: false
+  FunctionMaxLength:
+    active: false
+  FunctionMinLength:
+    active: false
+  FunctionNaming:
+    active: true
+    functionPattern: '[a-zA-Z][a-zA-Z0-9]*'
+    excludeClassPattern: '$^'
+    ignoreAnnotated:
+      - 'Composable'
+  FunctionParameterNaming:
+    active: true
+    parameterPattern: '[a-z][A-Za-z0-9]*'
+    excludeClassPattern: '$^'
+  InvalidPackageDeclaration:
+    active: true
+    rootPackage: 'com.atridad.ascently'
+  LambdaParameterNaming:
+    active: true
+    parameterPattern: '[a-z][A-Za-z0-9]*|_'
+  MatchingDeclarationName:
+    active: false
+    mustBeFirst: true
+  MemberNameEqualsClassName:
+    active: true
+    ignoreOverridden: true
+  NoNameShadowing:
+    active: true
+  NonBooleanPropertyPrefixedWithIs:
+    active: true
+  ObjectPropertyNaming:
+    active: false
+  PackageNaming:
+    active: true
+    packagePattern: '[a-z]+(\.[a-z][A-Za-z0-9]*)*'
+  TopLevelPropertyNaming:
+    active: true
+    constantPattern: '[A-Z][_A-Z0-9]*'
+    propertyPattern: '[A-Za-z][_A-Za-z0-9]*'
+    privatePropertyPattern: '_?[A-Za-z][A-Za-z0-9]*'
+  VariableMaxLength:
+    active: false
+  VariableMinLength:
+    active: false
+  VariableNaming:
+    active: true
+    variablePattern: '[a-z][A-Za-z0-9]*'
+    privateVariablePattern: '[_a-z][A-Za-z0-9]*'
+    excludeClassPattern: '$^'
+
+performance:
+  active: true
+  ArrayPrimitive:
+    active: true
+  CouldBeSequence:
+    active: false
+  ForEachOnRange:
+    active: true
+  SpreadOperator:
+    active: false
+  UnnecessaryPartOfBinaryExpression:
+    active: true
+  UnnecessaryTemporaryInstantiation:
+    active: true
+
+potential-bugs:
+  active: true
+  AvoidReferentialEquality:
+    active: true
+  CastNullableToNonNullableType:
+    active: true
+  CastToNullableType:
+    active: false
+  Deprecation:
+    active: false
+  DontDowncastCollectionTypes:
+    active: true
+  DoubleMutabilityForCollection:
+    active: true
+  ElseCaseInsteadOfExhaustiveWhen:
+    active: false
+  EqualsAlwaysReturnsTrueOrFalse:
+    active: true
+  EqualsWithHashCodeExist:
+    active: true
+  ExitOutsideMain:
+    active: false
+  ExplicitGarbageCollectionCall:
+    active: true
+  HasPlatformType:
+    active: true
+  IgnoredReturnValue:
+    active: true
+  ImplicitDefaultLocale:
+    active: true
+  ImplicitUnitReturnType:
+    active: true
+    allowExplicitReturnType: true
+  InvalidRange:
+    active: true
+  IteratorHasNextCallsNextMethod:
+    active: true
+  IteratorNotThrowingNoSuchElementException:
+    active: true
+  LateinitUsage:
+    active: false
+  MapGetWithNotNullAssertionOperator:
+    active: true
+  MissingPackageDeclaration:
+    active: true
+  NullCheckOnMutableProperty:
+    active: true
+  NullableToStringCall:
+    active: true
+  PropertyUsedBeforeDeclaration:
+    active: false
+  UnconditionalJumpStatementInLoop:
+    active: true
+  UnnecessaryNotNullCheck:
+    active: true
+  UnnecessaryNotNullOperator:
+    active: true
+  UnnecessarySafeCall:
+    active: true
+  UnreachableCatchBlock:
+    active: true
+  UnreachableCode:
+    active: true
+  UnsafeCallOnNullableType:
+    active: true
+  UnsafeCast:
+    active: true
+  UnusedUnaryOperator:
+    active: true
+  UselessPostfixExpression:
+    active: true
+  WrongEqualsTypeParameter:
+    active: true
+
+style:
+  active: true
+  AlsoCouldBeApply:
+    active: false
+  BracesOnIfStatements:
+    active: false
+    singleLine: 'never'
+    multiLine: 'always'
+  BracesOnWhenStatements:
+    active: false
+    singleLine: 'necessary'
+    multiLine: 'necessary'
+  CanBeNonNullable:
+    active: true
+  CascadingCallWrapping:
+    active: false
+  ClassOrdering:
+    active: false
+  CollapsibleIfStatements:
+    active: false
+  DataClassContainsFunctions:
+    active: false
+  DataClassShouldBeImmutable:
+    active: true
+  DestructuringDeclarationWithTooManyEntries:
+    active: true
+    maxDestructuringEntries: 5
+  EqualsNullCall:
+    active: true
+  EqualsOnSignatureLine:
+    active: true
+  ExplicitCollectionElementAccessMethod:
+    active: true
+  ExplicitItLambdaParameter:
+    active: false
+  ExpressionBodySyntax:
+    active: false
+    includeLineWrapping: false
+  ForbiddenAnnotation:
+    active: false
+  ForbiddenComment:
+    active: false
+  ForbiddenImport:
+    active: false
+  ForbiddenMethodCall:
+    active: false
+  ForbiddenSuppress:
+    active: false
+  ForbiddenVoid:
+    active: true
+    ignoreOverridden: true
+    ignoreUsageInGenerics: true
+  FunctionOnlyReturningConstant:
+    active: false
+    ignoreOverridableFunction: true
+    ignoreActualFunction: true
+    excludedFunctions: []
+  LoopWithTooManyJumpStatements:
+    active: true
+    maxJumpCount: 2
+  MagicNumber:
+    active: false
+  MandatoryBracesLoops:
+    active: true
+  MaxChainedCallsOnSameLine:
+    active: true
+    maxChainedCalls: 5
+  MaxLineLength:
+    active: true
+    maxLineLength: 220
+    excludePackageStatements: true
+    excludeImportStatements: true
+    excludeCommentStatements: true
+    excludeRawStrings: true
+  MayBeConst:
+    active: true
+  ModifierOrder:
+    active: true
+  MultilineRawStringIndentation:
+    active: false
+    indentSize: 4
+  MultilineLambdaItParameter:
+    active: true
+  NestedClassesVisibility:
+    active: true
+  NewLineAtEndOfFile:
+    active: false
+  NoTabs:
+    active: true
+  NullableBooleanCheck:
+    active: true
+  ObjectLiteralToLambda:
+    active: true
+  OptionalAbstractKeyword:
+    active: true
+  OptionalUnit:
+    active: true
+  PreferToOverPairSyntax:
+    active: true
+  ProtectedMemberInFinalClass:
+    active: true
+  RedundantExplicitType:
+    active: true
+  RedundantHigherOrderMapUsage:
+    active: true
+  RedundantVisibilityModifierRule:
+    active: false
+  ReturnCount:
+    active: true
+    max: 6
+    excludedFunctions:
+      - 'equals'
+    excludeLabeled: true
+    excludeReturnFromLambda: true
+    excludeGuardClauses: true
+  SafeCast:
+    active: true
+  SerialVersionUIDInSerializableClass:
+    active: false
+  SpacingBetweenPackageAndImports:
+    active: true
+  StringShouldBeRawString:
+    active: false
+  ThrowsCount:
+    active: true
+    max: 10
+    excludeGuardClauses: true
+  TrailingWhitespace:
+    active: false
+  TrimMultilineRawString:
+    active: true
+  UnderscoresInNumericLiterals:
+    active: false
+    acceptableLength: 4
+    allowNonStandardGrouping: false
+  UnnecessaryAbstractClass:
+    active: true
+  UnnecessaryAnnotationUseSiteTarget:
+    active: true
+  UnnecessaryApply:
+    active: true
+  UnnecessaryBackticks:
+    active: true
+  UnnecessaryBracesAroundTrailingLambda:
+    active: true
+  UnnecessaryFilter:
+    active: true
+  UnnecessaryInheritance:
+    active: true
+  UnnecessaryInnerClass:
+    active: true
+  UnnecessaryLet:
+    active: true
+  UnnecessaryParentheses:
+    active: false
+    allowForUnclearPrecedence: true
+  UntilInsteadOfRangeTo:
+    active: true
+  UnusedImports:
+    active: true
+  UnusedParameter:
+    active: true
+    allowedNames: 'ignored|expected|_|session|startTime|endTime|xAxisFormatter'
+  UnusedPrivateClass:
+    active: true
+  UnusedPrivateMember:
+    active: true
+    allowedNames: '(_|ignored|expected|serialVersionUID)'
+  UnusedPrivateProperty:
+    active: true
+    allowedNames: '_|ignored|expected|serialVersionUID'
+  UseAnyOrNoneInsteadOfFind:
+    active: true
+  UseArrayLiteralsInAnnotations:
+    active: true
+  UseCheckNotNull:
+    active: true
+  UseCheckOrError:
+    active: true
+  UseDataClass:
+    active: false
+  UseEmptyCounterpart:
+    active: true
+  UseIfEmptyOrIfBlank:
+    active: true
+  UseIfInsteadOfWhen:
+    active: false
+  UseIsNullOrEmpty:
+    active: true
+  UseLet:
+    active: false
+  UseOrEmpty:
+    active: true
+  UseRequire:
+    active: true
+  UseRequireNotNull:
+    active: true
+  UseSumOfInsteadOfFlatMapSize:
+    active: true
+  UselessCallOnNotNull:
+    active: true
+  UtilityClassWithPublicConstructor:
+    active: true
+  VarCouldBeVal:
+    active: true
+  WildcardImport:
+    active: false
+    excludeImports:
+      - 'java.util.*'
+      - 'kotlinx.android.synthetic.*'

android/gradle.properties

@@ -10,7 +10,11 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. For more details, visit
 # https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
-# org.gradle.parallel=true
+org.gradle.parallel=true
+# Enable Gradle build caching for faster incremental builds
+org.gradle.caching=true
+# Enable configuration caching for faster configuration phase
+org.gradle.configuration-cache=true
 # AndroidX package structure to make it clearer which packages are bundled with the
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn

android/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 agp = "8.12.3"
-kotlin = "2.2.21"
+kotlin = "2.3.0"
 coreKtx = "1.17.0"
 junit = "4.13.2"
 junitVersion = "1.3.0"
@@ -10,8 +10,8 @@ androidxTestExt = "1.3.0"
 androidxTestRunner = "1.7.0"
 androidxTestRules = "1.7.0"
 lifecycleRuntimeKtx = "2.10.0"
-activityCompose = "1.12.0"
-composeBom = "2025.11.01"
+activityCompose = "1.12.2"
+composeBom = "2025.12.01"
 room = "2.8.4"
 navigation = "2.9.6"
 viewmodel = "2.10.0"
@@ -19,7 +19,10 @@ kotlinxSerialization = "1.9.0"
 kotlinxCoroutines = "1.10.2"
 coil = "2.7.0"
 ksp = "2.2.20-2.0.3"
-exifinterface = "1.4.1"
+exifinterface = "1.4.2"
+healthConnect = "1.1.0"
+detekt = "1.23.8"
+spotless = "8.1.0"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -69,9 +72,14 @@ mockk = { group = "io.mockk", name = "mockk", version = "1.14.6" }
 coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil" }
 androidx-exifinterface = { group = "androidx.exifinterface", name = "exifinterface", version.ref = "exifinterface" }
 
+# Health Connect
+health-connect = { group = "androidx.health.connect", name = "connect-client", version.ref = "healthConnect" }
+
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
+detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
+spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }

android/gradlew.bat

@@ -1,93 +1,93 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
-
-@if "%DEBUG%"=="" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
-
-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

branding/.gitignore

@@ -1,3 +0,0 @@
-*.tmp
-.DS_Store
-*.log