0.4.2 - Fixed issue with photo upload streams

.gitignore

@@ -0,0 +1,35 @@
+# Gradle files
+.gradle/
+build/
+release/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Log/OS Files
+*.log
+
+# Android Studio generated files and folders
+captures/
+.externalNativeBuild/
+.cxx/
+*.aab
+*.apk
+output-metadata.json
+
+# IntelliJ
+*.iml
+.idea/
+misc.xml
+deploymentTargetDropDown.xml
+render.experimental.xml
+
+# Keystore files
+*.jks
+*.keystore
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Android Profiling
+*.hprof

.gradle/8.9/dependencies-accessors/57fb967dccc07e69f15c0ef4df812ab540c3e7b1/sources/org/gradle/accessors/dm/LibrariesForLibs.java

@@ -1,769 +0,0 @@
-package org.gradle.accessors.dm;
-
-import org.gradle.api.NonNullApi;
-import org.gradle.api.artifacts.MinimalExternalModuleDependency;
-import org.gradle.plugin.use.PluginDependency;
-import org.gradle.api.artifacts.ExternalModuleDependencyBundle;
-import org.gradle.api.artifacts.MutableVersionConstraint;
-import org.gradle.api.provider.Provider;
-import org.gradle.api.model.ObjectFactory;
-import org.gradle.api.provider.ProviderFactory;
-import org.gradle.api.internal.catalog.AbstractExternalDependencyFactory;
-import org.gradle.api.internal.catalog.DefaultVersionCatalog;
-import java.util.Map;
-import org.gradle.api.internal.attributes.ImmutableAttributesFactory;
-import org.gradle.api.internal.artifacts.dsl.CapabilityNotationParser;
-import javax.inject.Inject;
-
-/**
- * A catalog of dependencies accessible via the {@code libs} extension.
- */
-@NonNullApi
-public class LibrariesForLibs extends AbstractExternalDependencyFactory {
-
-    private final AbstractExternalDependencyFactory owner = this;
-    private final AndroidxLibraryAccessors laccForAndroidxLibraryAccessors = new AndroidxLibraryAccessors(owner);
-    private final CoilLibraryAccessors laccForCoilLibraryAccessors = new CoilLibraryAccessors(owner);
-    private final KotlinxLibraryAccessors laccForKotlinxLibraryAccessors = new KotlinxLibraryAccessors(owner);
-    private final VersionAccessors vaccForVersionAccessors = new VersionAccessors(providers, config);
-    private final BundleAccessors baccForBundleAccessors = new BundleAccessors(objects, providers, config, attributesFactory, capabilityNotationParser);
-    private final PluginAccessors paccForPluginAccessors = new PluginAccessors(providers, config);
-
-    @Inject
-    public LibrariesForLibs(DefaultVersionCatalog config, ProviderFactory providers, ObjectFactory objects, ImmutableAttributesFactory attributesFactory, CapabilityNotationParser capabilityNotationParser) {
-        super(config, providers, objects, attributesFactory, capabilityNotationParser);
-    }
-
-    /**
-     * Dependency provider for <b>junit</b> with <b>junit:junit</b> coordinates and
-     * with version reference <b>junit</b>
-     * <p>
-     * This dependency was declared in catalog libs.versions.toml
-     */
-    public Provider<MinimalExternalModuleDependency> getJunit() {
-        return create("junit");
-    }
-
-    /**
-     * Dependency provider for <b>mpandroidchart</b> with <b>com.github.PhilJay:MPAndroidChart</b> coordinates and
-     * with version <b>v3.1.0</b>
-     * <p>
-     * This dependency was declared in catalog libs.versions.toml
-     */
-    public Provider<MinimalExternalModuleDependency> getMpandroidchart() {
-        return create("mpandroidchart");
-    }
-
-    /**
-     * Group of libraries at <b>androidx</b>
-     */
-    public AndroidxLibraryAccessors getAndroidx() {
-        return laccForAndroidxLibraryAccessors;
-    }
-
-    /**
-     * Group of libraries at <b>coil</b>
-     */
-    public CoilLibraryAccessors getCoil() {
-        return laccForCoilLibraryAccessors;
-    }
-
-    /**
-     * Group of libraries at <b>kotlinx</b>
-     */
-    public KotlinxLibraryAccessors getKotlinx() {
-        return laccForKotlinxLibraryAccessors;
-    }
-
-    /**
-     * Group of versions at <b>versions</b>
-     */
-    public VersionAccessors getVersions() {
-        return vaccForVersionAccessors;
-    }
-
-    /**
-     * Group of bundles at <b>bundles</b>
-     */
-    public BundleAccessors getBundles() {
-        return baccForBundleAccessors;
-    }
-
-    /**
-     * Group of plugins at <b>plugins</b>
-     */
-    public PluginAccessors getPlugins() {
-        return paccForPluginAccessors;
-    }
-
-    public static class AndroidxLibraryAccessors extends SubDependencyFactory {
-        private final AndroidxActivityLibraryAccessors laccForAndroidxActivityLibraryAccessors = new AndroidxActivityLibraryAccessors(owner);
-        private final AndroidxComposeLibraryAccessors laccForAndroidxComposeLibraryAccessors = new AndroidxComposeLibraryAccessors(owner);
-        private final AndroidxCoreLibraryAccessors laccForAndroidxCoreLibraryAccessors = new AndroidxCoreLibraryAccessors(owner);
-        private final AndroidxEspressoLibraryAccessors laccForAndroidxEspressoLibraryAccessors = new AndroidxEspressoLibraryAccessors(owner);
-        private final AndroidxLifecycleLibraryAccessors laccForAndroidxLifecycleLibraryAccessors = new AndroidxLifecycleLibraryAccessors(owner);
-        private final AndroidxNavigationLibraryAccessors laccForAndroidxNavigationLibraryAccessors = new AndroidxNavigationLibraryAccessors(owner);
-        private final AndroidxRoomLibraryAccessors laccForAndroidxRoomLibraryAccessors = new AndroidxRoomLibraryAccessors(owner);
-        private final AndroidxUiLibraryAccessors laccForAndroidxUiLibraryAccessors = new AndroidxUiLibraryAccessors(owner);
-
-        public AndroidxLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); }
-
-        /**
-         * Dependency provider for <b>junit</b> with <b>androidx.test.ext:junit</b> coordinates and
-         * with version reference <b>junitVersion</b>
-         * <p>
-         * This dependency was declared in catalog libs.versions.toml
-         */
-        public Provider<MinimalExternalModuleDependency> getJunit() {
-            return create("androidx.junit");
-        }
-
-        /**
-         * Dependency provider for <b>material3</b> with <b>androidx.compose.material3:material3</b> coordinates and
-         * with <b>no version specified</b>
-         * <p>
-         * This dependency was declared in catalog libs.versions.toml
-         */
-        public Provider<MinimalExternalModuleDependency> getMaterial3() {
-            return create("androidx.material3");
-        }
-
-        /**
-         * Group of libraries at <b>androidx.activity</b>
-         */
-        public AndroidxActivityLibraryAccessors getActivity() {
-            return laccForAndroidxActivityLibraryAccessors;
-        }
-
-        /**
-         * Group of libraries at <b>androidx.compose</b>
-         */
-        public AndroidxComposeLibraryAccessors getCompose() {
-            return laccForAndroidxComposeLibraryAccessors;
-        }
-
-        /**
-         * Group of libraries at <b>androidx.core</b>
-         */
-        public AndroidxCoreLibraryAccessors getCore() {
-            return laccForAndroidxCoreLibraryAccessors;
-        }
-
-        /**
-         * Group of libraries at <b>androidx.espresso</b>
-         */
-        public AndroidxEspressoLibraryAccessors getEspresso() {
-            return laccForAndroidxEspressoLibraryAccessors;
-        }
-
-        /**
-         * Group of libraries at <b>androidx.lifecycle</b>
-         */
-        public AndroidxLifecycleLibraryAccessors getLifecycle() {
-            return laccForAndroidxLifecycleLibraryAccessors;
-        }
-
-        /**
-         * Group of libraries at <b>androidx.navigation</b>
-         */
-        public AndroidxNavigationLibraryAccessors getNavigation() {
-            return laccForAndroidxNavigationLibraryAccessors;
-        }
-
-        /**
-         * Group of libraries at <b>androidx.room</b>
-         */
-        public AndroidxRoomLibraryAccessors getRoom() {
-            return laccForAndroidxRoomLibraryAccessors;
-        }
-
-        /**
-         * Group of libraries at <b>androidx.ui</b>
-         */
-        public AndroidxUiLibraryAccessors getUi() {
-            return laccForAndroidxUiLibraryAccessors;
-        }
-
-    }
-
-    public static class AndroidxActivityLibraryAccessors extends SubDependencyFactory {
-
-        public AndroidxActivityLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); }
-
-        /**
-         * Dependency provider for <b>compose</b> with <b>androidx.activity:activity-compose</b> coordinates and
-         * with version reference <b>activityCompose</b>
-         * <p>
-         * This dependency was declared in catalog libs.versions.toml
-         */
-        public Provider<MinimalExternalModuleDependency> getCompose() {
-            return create("androidx.activity.compose");
-        }
-
-    }
-
-    public static class AndroidxComposeLibraryAccessors extends SubDependencyFactory {
-
-        public AndroidxComposeLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); }
-
-        /**
-         * Dependency provider for <b>bom</b> with <b>androidx.compose:compose-bom</b> coordinates and
-         * with version reference <b>composeBom</b>
-         * <p>
-         * This dependency was declared in catalog libs.versions.toml
-         */
-        public Provider<MinimalExternalModuleDependency> getBom() {
-            return create("androidx.compose.bom");
-        }
-
-    }
-
-    public static class AndroidxCoreLibraryAccessors extends SubDependencyFactory {
-
-        public AndroidxCoreLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); }
-
-        /**
-         * Dependency provider for <b>ktx</b> with <b>androidx.core:core-ktx</b> coordinates and
-         * with version reference <b>coreKtx</b>
-         * <p>
-         * This dependency was declared in catalog libs.versions.toml
-         */
-        public Provider<MinimalExternalModuleDependency> getKtx() {
-            return create("androidx.core.ktx");
-        }
-
-    }
-
-    public static class AndroidxEspressoLibraryAccessors extends SubDependencyFactory {
-
-        public AndroidxEspressoLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); }
-
-        /**
-         * Dependency provider for <b>core</b> with <b>androidx.test.espresso:espresso-core</b> coordinates and
-         * with version reference <b>espressoCore</b>
-         * <p>
-         * This dependency was declared in catalog libs.versions.toml
-         */
-        public Provider<MinimalExternalModuleDependency> getCore() {
-            return create("androidx.espresso.core");
-        }
-
-    }
-
-    public static class AndroidxLifecycleLibraryAccessors extends SubDependencyFactory {
-        private final AndroidxLifecycleRuntimeLibraryAccessors laccForAndroidxLifecycleRuntimeLibraryAccessors = new AndroidxLifecycleRuntimeLibraryAccessors(owner);
-        private final AndroidxLifecycleViewmodelLibraryAccessors laccForAndroidxLifecycleViewmodelLibraryAccessors = new AndroidxLifecycleViewmodelLibraryAccessors(owner);
-
-        public AndroidxLifecycleLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); }
-
-        /**
-         * Group of libraries at <b>androidx.lifecycle.runtime</b>
-         */
-        public AndroidxLifecycleRuntimeLibraryAccessors getRuntime() {
-            return laccForAndroidxLifecycleRuntimeLibraryAccessors;
-        }
-
-        /**
-         * Group of libraries at <b>androidx.lifecycle.viewmodel</b>
-         */
-        public AndroidxLifecycleViewmodelLibraryAccessors getViewmodel() {
-            return laccForAndroidxLifecycleViewmodelLibraryAccessors;
-        }
-
-    }
-
-    public static class AndroidxLifecycleRuntimeLibraryAccessors extends SubDependencyFactory {
-
-        public AndroidxLifecycleRuntimeLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); }
-
-        /**
-         * Dependency provider for <b>ktx</b> with <b>androidx.lifecycle:lifecycle-runtime-ktx</b> coordinates and
-         * with version reference <b>lifecycleRuntimeKtx</b>
-         * <p>
-         * This dependency was declared in catalog libs.versions.toml
-         */
-        public Provider<MinimalExternalModuleDependency> getKtx() {
-            return create("androidx.lifecycle.runtime.ktx");
-        }
-
-    }
-
-    public static class AndroidxLifecycleViewmodelLibraryAccessors extends SubDependencyFactory {
-
-        public AndroidxLifecycleViewmodelLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); }
-
-        /**
-         * Dependency provider for <b>compose</b> with <b>androidx.lifecycle:lifecycle-viewmodel-compose</b> coordinates and
-         * with version reference <b>viewmodel</b>
-         * <p>
-         * This dependency was declared in catalog libs.versions.toml
-         */
-        public Provider<MinimalExternalModuleDependency> getCompose() {
-            return create("androidx.lifecycle.viewmodel.compose");
-        }
-
-    }
-
-    public static class AndroidxNavigationLibraryAccessors extends SubDependencyFactory {
-
-        public AndroidxNavigationLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); }
-
-        /**
-         * Dependency provider for <b>compose</b> with <b>androidx.navigation:navigation-compose</b> coordinates and
-         * with version reference <b>navigation</b>
-         * <p>
-         * This dependency was declared in catalog libs.versions.toml
-         */
-        public Provider<MinimalExternalModuleDependency> getCompose() {
-            return create("androidx.navigation.compose");
-        }
-
-    }
-
-    public static class AndroidxRoomLibraryAccessors extends SubDependencyFactory {
-
-        public AndroidxRoomLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); }
-
-        /**
-         * Dependency provider for <b>compiler</b> with <b>androidx.room:room-compiler</b> coordinates and
-         * with version reference <b>room</b>
-         * <p>
-         * This dependency was declared in catalog libs.versions.toml
-         */
-        public Provider<MinimalExternalModuleDependency> getCompiler() {
-            return create("androidx.room.compiler");
-        }
-
-        /**
-         * Dependency provider for <b>ktx</b> with <b>androidx.room:room-ktx</b> coordinates and
-         * with version reference <b>room</b>
-         * <p>
-         * This dependency was declared in catalog libs.versions.toml
-         */
-        public Provider<MinimalExternalModuleDependency> getKtx() {
-            return create("androidx.room.ktx");
-        }
-
-        /**
-         * Dependency provider for <b>runtime</b> with <b>androidx.room:room-runtime</b> coordinates and
-         * with version reference <b>room</b>
-         * <p>
-         * This dependency was declared in catalog libs.versions.toml
-         */
-        public Provider<MinimalExternalModuleDependency> getRuntime() {
-            return create("androidx.room.runtime");
-        }
-
-    }
-
-    public static class AndroidxUiLibraryAccessors extends SubDependencyFactory implements DependencyNotationSupplier {
-        private final AndroidxUiTestLibraryAccessors laccForAndroidxUiTestLibraryAccessors = new AndroidxUiTestLibraryAccessors(owner);
-        private final AndroidxUiToolingLibraryAccessors laccForAndroidxUiToolingLibraryAccessors = new AndroidxUiToolingLibraryAccessors(owner);
-
-        public AndroidxUiLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); }
-
-        /**
-         * Dependency provider for <b>ui</b> with <b>androidx.compose.ui:ui</b> coordinates and
-         * with <b>no version specified</b>
-         * <p>
-         * This dependency was declared in catalog libs.versions.toml
-         */
-        public Provider<MinimalExternalModuleDependency> asProvider() {
-            return create("androidx.ui");
-        }
-
-        /**
-         * Dependency provider for <b>graphics</b> with <b>androidx.compose.ui:ui-graphics</b> coordinates and
-         * with <b>no version specified</b>
-         * <p>
-         * This dependency was declared in catalog libs.versions.toml
-         */
-        public Provider<MinimalExternalModuleDependency> getGraphics() {
-            return create("androidx.ui.graphics");
-        }
-
-        /**
-         * Group of libraries at <b>androidx.ui.test</b>
-         */
-        public AndroidxUiTestLibraryAccessors getTest() {
-            return laccForAndroidxUiTestLibraryAccessors;
-        }
-
-        /**
-         * Group of libraries at <b>androidx.ui.tooling</b>
-         */
-        public AndroidxUiToolingLibraryAccessors getTooling() {
-            return laccForAndroidxUiToolingLibraryAccessors;
-        }
-
-    }
-
-    public static class AndroidxUiTestLibraryAccessors extends SubDependencyFactory {
-
-        public AndroidxUiTestLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); }
-
-        /**
-         * Dependency provider for <b>junit4</b> with <b>androidx.compose.ui:ui-test-junit4</b> coordinates and
-         * with <b>no version specified</b>
-         * <p>
-         * This dependency was declared in catalog libs.versions.toml
-         */
-        public Provider<MinimalExternalModuleDependency> getJunit4() {
-            return create("androidx.ui.test.junit4");
-        }
-
-        /**
-         * Dependency provider for <b>manifest</b> with <b>androidx.compose.ui:ui-test-manifest</b> coordinates and
-         * with <b>no version specified</b>
-         * <p>
-         * This dependency was declared in catalog libs.versions.toml
-         */
-        public Provider<MinimalExternalModuleDependency> getManifest() {
-            return create("androidx.ui.test.manifest");
-        }
-
-    }
-
-    public static class AndroidxUiToolingLibraryAccessors extends SubDependencyFactory implements DependencyNotationSupplier {
-
-        public AndroidxUiToolingLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); }
-
-        /**
-         * Dependency provider for <b>tooling</b> with <b>androidx.compose.ui:ui-tooling</b> coordinates and
-         * with <b>no version specified</b>
-         * <p>
-         * This dependency was declared in catalog libs.versions.toml
-         */
-        public Provider<MinimalExternalModuleDependency> asProvider() {
-            return create("androidx.ui.tooling");
-        }
-
-        /**
-         * Dependency provider for <b>preview</b> with <b>androidx.compose.ui:ui-tooling-preview</b> coordinates and
-         * with <b>no version specified</b>
-         * <p>
-         * This dependency was declared in catalog libs.versions.toml
-         */
-        public Provider<MinimalExternalModuleDependency> getPreview() {
-            return create("androidx.ui.tooling.preview");
-        }
-
-    }
-
-    public static class CoilLibraryAccessors extends SubDependencyFactory {
-
-        public CoilLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); }
-
-        /**
-         * Dependency provider for <b>compose</b> with <b>io.coil-kt:coil-compose</b> coordinates and
-         * with version reference <b>coil</b>
-         * <p>
-         * This dependency was declared in catalog libs.versions.toml
-         */
-        public Provider<MinimalExternalModuleDependency> getCompose() {
-            return create("coil.compose");
-        }
-
-    }
-
-    public static class KotlinxLibraryAccessors extends SubDependencyFactory {
-        private final KotlinxCoroutinesLibraryAccessors laccForKotlinxCoroutinesLibraryAccessors = new KotlinxCoroutinesLibraryAccessors(owner);
-        private final KotlinxSerializationLibraryAccessors laccForKotlinxSerializationLibraryAccessors = new KotlinxSerializationLibraryAccessors(owner);
-
-        public KotlinxLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); }
-
-        /**
-         * Group of libraries at <b>kotlinx.coroutines</b>
-         */
-        public KotlinxCoroutinesLibraryAccessors getCoroutines() {
-            return laccForKotlinxCoroutinesLibraryAccessors;
-        }
-
-        /**
-         * Group of libraries at <b>kotlinx.serialization</b>
-         */
-        public KotlinxSerializationLibraryAccessors getSerialization() {
-            return laccForKotlinxSerializationLibraryAccessors;
-        }
-
-    }
-
-    public static class KotlinxCoroutinesLibraryAccessors extends SubDependencyFactory {
-
-        public KotlinxCoroutinesLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); }
-
-        /**
-         * Dependency provider for <b>android</b> with <b>org.jetbrains.kotlinx:kotlinx-coroutines-android</b> coordinates and
-         * with version reference <b>kotlinxCoroutines</b>
-         * <p>
-         * This dependency was declared in catalog libs.versions.toml
-         */
-        public Provider<MinimalExternalModuleDependency> getAndroid() {
-            return create("kotlinx.coroutines.android");
-        }
-
-    }
-
-    public static class KotlinxSerializationLibraryAccessors extends SubDependencyFactory {
-
-        public KotlinxSerializationLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); }
-
-        /**
-         * Dependency provider for <b>json</b> with <b>org.jetbrains.kotlinx:kotlinx-serialization-json</b> coordinates and
-         * with version reference <b>kotlinxSerialization</b>
-         * <p>
-         * This dependency was declared in catalog libs.versions.toml
-         */
-        public Provider<MinimalExternalModuleDependency> getJson() {
-            return create("kotlinx.serialization.json");
-        }
-
-    }
-
-    public static class VersionAccessors extends VersionFactory  {
-
-        public VersionAccessors(ProviderFactory providers, DefaultVersionCatalog config) { super(providers, config); }
-
-        /**
-         * Version alias <b>activityCompose</b> with value <b>1.10.1</b>
-         * <p>
-         * If the version is a rich version and cannot be represented as a
-         * single version string, an empty string is returned.
-         * <p>
-         * This version was declared in catalog libs.versions.toml
-         */
-        public Provider<String> getActivityCompose() { return getVersion("activityCompose"); }
-
-        /**
-         * Version alias <b>agp</b> with value <b>8.9.1</b>
-         * <p>
-         * If the version is a rich version and cannot be represented as a
-         * single version string, an empty string is returned.
-         * <p>
-         * This version was declared in catalog libs.versions.toml
-         */
-        public Provider<String> getAgp() { return getVersion("agp"); }
-
-        /**
-         * Version alias <b>coil</b> with value <b>2.7.0</b>
-         * <p>
-         * If the version is a rich version and cannot be represented as a
-         * single version string, an empty string is returned.
-         * <p>
-         * This version was declared in catalog libs.versions.toml
-         */
-        public Provider<String> getCoil() { return getVersion("coil"); }
-
-        /**
-         * Version alias <b>composeBom</b> with value <b>2024.09.00</b>
-         * <p>
-         * If the version is a rich version and cannot be represented as a
-         * single version string, an empty string is returned.
-         * <p>
-         * This version was declared in catalog libs.versions.toml
-         */
-        public Provider<String> getComposeBom() { return getVersion("composeBom"); }
-
-        /**
-         * Version alias <b>coreKtx</b> with value <b>1.15.0</b>
-         * <p>
-         * If the version is a rich version and cannot be represented as a
-         * single version string, an empty string is returned.
-         * <p>
-         * This version was declared in catalog libs.versions.toml
-         */
-        public Provider<String> getCoreKtx() { return getVersion("coreKtx"); }
-
-        /**
-         * Version alias <b>espressoCore</b> with value <b>3.7.0</b>
-         * <p>
-         * If the version is a rich version and cannot be represented as a
-         * single version string, an empty string is returned.
-         * <p>
-         * This version was declared in catalog libs.versions.toml
-         */
-        public Provider<String> getEspressoCore() { return getVersion("espressoCore"); }
-
-        /**
-         * Version alias <b>junit</b> with value <b>4.13.2</b>
-         * <p>
-         * If the version is a rich version and cannot be represented as a
-         * single version string, an empty string is returned.
-         * <p>
-         * This version was declared in catalog libs.versions.toml
-         */
-        public Provider<String> getJunit() { return getVersion("junit"); }
-
-        /**
-         * Version alias <b>junitVersion</b> with value <b>1.3.0</b>
-         * <p>
-         * If the version is a rich version and cannot be represented as a
-         * single version string, an empty string is returned.
-         * <p>
-         * This version was declared in catalog libs.versions.toml
-         */
-        public Provider<String> getJunitVersion() { return getVersion("junitVersion"); }
-
-        /**
-         * Version alias <b>kotlin</b> with value <b>2.0.21</b>
-         * <p>
-         * If the version is a rich version and cannot be represented as a
-         * single version string, an empty string is returned.
-         * <p>
-         * This version was declared in catalog libs.versions.toml
-         */
-        public Provider<String> getKotlin() { return getVersion("kotlin"); }
-
-        /**
-         * Version alias <b>kotlinxCoroutines</b> with value <b>1.9.0</b>
-         * <p>
-         * If the version is a rich version and cannot be represented as a
-         * single version string, an empty string is returned.
-         * <p>
-         * This version was declared in catalog libs.versions.toml
-         */
-        public Provider<String> getKotlinxCoroutines() { return getVersion("kotlinxCoroutines"); }
-
-        /**
-         * Version alias <b>kotlinxSerialization</b> with value <b>1.7.1</b>
-         * <p>
-         * If the version is a rich version and cannot be represented as a
-         * single version string, an empty string is returned.
-         * <p>
-         * This version was declared in catalog libs.versions.toml
-         */
-        public Provider<String> getKotlinxSerialization() { return getVersion("kotlinxSerialization"); }
-
-        /**
-         * Version alias <b>ksp</b> with value <b>2.0.21-1.0.25</b>
-         * <p>
-         * If the version is a rich version and cannot be represented as a
-         * single version string, an empty string is returned.
-         * <p>
-         * This version was declared in catalog libs.versions.toml
-         */
-        public Provider<String> getKsp() { return getVersion("ksp"); }
-
-        /**
-         * Version alias <b>lifecycleRuntimeKtx</b> with value <b>2.9.2</b>
-         * <p>
-         * If the version is a rich version and cannot be represented as a
-         * single version string, an empty string is returned.
-         * <p>
-         * This version was declared in catalog libs.versions.toml
-         */
-        public Provider<String> getLifecycleRuntimeKtx() { return getVersion("lifecycleRuntimeKtx"); }
-
-        /**
-         * Version alias <b>navigation</b> with value <b>2.8.4</b>
-         * <p>
-         * If the version is a rich version and cannot be represented as a
-         * single version string, an empty string is returned.
-         * <p>
-         * This version was declared in catalog libs.versions.toml
-         */
-        public Provider<String> getNavigation() { return getVersion("navigation"); }
-
-        /**
-         * Version alias <b>room</b> with value <b>2.6.1</b>
-         * <p>
-         * If the version is a rich version and cannot be represented as a
-         * single version string, an empty string is returned.
-         * <p>
-         * This version was declared in catalog libs.versions.toml
-         */
-        public Provider<String> getRoom() { return getVersion("room"); }
-
-        /**
-         * Version alias <b>viewmodel</b> with value <b>2.9.2</b>
-         * <p>
-         * If the version is a rich version and cannot be represented as a
-         * single version string, an empty string is returned.
-         * <p>
-         * This version was declared in catalog libs.versions.toml
-         */
-        public Provider<String> getViewmodel() { return getVersion("viewmodel"); }
-
-    }
-
-    public static class BundleAccessors extends BundleFactory {
-
-        public BundleAccessors(ObjectFactory objects, ProviderFactory providers, DefaultVersionCatalog config, ImmutableAttributesFactory attributesFactory, CapabilityNotationParser capabilityNotationParser) { super(objects, providers, config, attributesFactory, capabilityNotationParser); }
-
-    }
-
-    public static class PluginAccessors extends PluginFactory {
-        private final AndroidPluginAccessors paccForAndroidPluginAccessors = new AndroidPluginAccessors(providers, config);
-        private final KotlinPluginAccessors paccForKotlinPluginAccessors = new KotlinPluginAccessors(providers, config);
-
-        public PluginAccessors(ProviderFactory providers, DefaultVersionCatalog config) { super(providers, config); }
-
-        /**
-         * Plugin provider for <b>ksp</b> with plugin id <b>com.google.devtools.ksp</b> and
-         * with version reference <b>ksp</b>
-         * <p>
-         * This plugin was declared in catalog libs.versions.toml
-         */
-        public Provider<PluginDependency> getKsp() { return createPlugin("ksp"); }
-
-        /**
-         * Group of plugins at <b>plugins.android</b>
-         */
-        public AndroidPluginAccessors getAndroid() {
-            return paccForAndroidPluginAccessors;
-        }
-
-        /**
-         * Group of plugins at <b>plugins.kotlin</b>
-         */
-        public KotlinPluginAccessors getKotlin() {
-            return paccForKotlinPluginAccessors;
-        }
-
-    }
-
-    public static class AndroidPluginAccessors extends PluginFactory {
-
-        public AndroidPluginAccessors(ProviderFactory providers, DefaultVersionCatalog config) { super(providers, config); }
-
-        /**
-         * Plugin provider for <b>android.application</b> with plugin id <b>com.android.application</b> and
-         * with version reference <b>agp</b>
-         * <p>
-         * This plugin was declared in catalog libs.versions.toml
-         */
-        public Provider<PluginDependency> getApplication() { return createPlugin("android.application"); }
-
-    }
-
-    public static class KotlinPluginAccessors extends PluginFactory {
-
-        public KotlinPluginAccessors(ProviderFactory providers, DefaultVersionCatalog config) { super(providers, config); }
-
-        /**
-         * Plugin provider for <b>kotlin.android</b> with plugin id <b>org.jetbrains.kotlin.android</b> and
-         * with version reference <b>kotlin</b>
-         * <p>
-         * This plugin was declared in catalog libs.versions.toml
-         */
-        public Provider<PluginDependency> getAndroid() { return createPlugin("kotlin.android"); }
-
-        /**
-         * Plugin provider for <b>kotlin.compose</b> with plugin id <b>org.jetbrains.kotlin.plugin.compose</b> and
-         * with version reference <b>kotlin</b>
-         * <p>
-         * This plugin was declared in catalog libs.versions.toml
-         */
-        public Provider<PluginDependency> getCompose() { return createPlugin("kotlin.compose"); }
-
-        /**
-         * Plugin provider for <b>kotlin.serialization</b> with plugin id <b>org.jetbrains.kotlin.plugin.serialization</b> and
-         * with version reference <b>kotlin</b>
-         * <p>
-         * This plugin was declared in catalog libs.versions.toml
-         */
-        public Provider<PluginDependency> getSerialization() { return createPlugin("kotlin.serialization"); }
-
-    }
-
-}

.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Fri Aug 15 14:37:16 MDT 2025
-gradle.version=8.11.1

.gradle/config.properties

@@ -1,2 +0,0 @@
-#Fri Aug 15 12:29:02 MDT 2025
-java.home=/Applications/Android Studio.app/Contents/jbr/Contents/Home

.kotlin/errors/errors-1755282386436.log

@@ -1,87 +0,0 @@
-kotlin version: 2.0.21
-error message: java.lang.IllegalStateException: Storage for [/Users/atridad/Developer/personal/OpenClimb/app/build/kspCaches/debug/symbolLookups/id-to-file.tab] is already registered
-	at org.jetbrains.kotlin.com.intellij.util.io.FilePageCache.registerPagedFileStorage(FilePageCache.java:410)
-	at org.jetbrains.kotlin.com.intellij.util.io.PagedFileStorage.<init>(PagedFileStorage.java:72)
-	at org.jetbrains.kotlin.com.intellij.util.io.ResizeableMappedFile.<init>(ResizeableMappedFile.java:55)
-	at org.jetbrains.kotlin.com.intellij.util.io.PersistentBTreeEnumerator.<init>(PersistentBTreeEnumerator.java:128)
-	at org.jetbrains.kotlin.com.intellij.util.io.PersistentEnumerator.createDefaultEnumerator(PersistentEnumerator.java:52)
-	at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.<init>(PersistentMapImpl.java:165)
-	at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.<init>(PersistentMapImpl.java:140)
-	at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapBuilder.buildImplementation(PersistentMapBuilder.java:88)
-	at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapBuilder.build(PersistentMapBuilder.java:71)
-	at org.jetbrains.kotlin.com.intellij.util.io.PersistentHashMap.<init>(PersistentHashMap.java:45)
-	at org.jetbrains.kotlin.com.intellij.util.io.PersistentHashMap.<init>(PersistentHashMap.java:71)
-	at org.jetbrains.kotlin.incremental.storage.LazyStorage.createMap(LazyStorage.kt:62)
-	at org.jetbrains.kotlin.incremental.storage.LazyStorage.getStorageOrCreateNew(LazyStorage.kt:59)
-	at org.jetbrains.kotlin.incremental.storage.LazyStorage.set(LazyStorage.kt:80)
-	at org.jetbrains.kotlin.incremental.storage.PersistentStorageWrapper.set(PersistentStorage.kt:96)
-	at org.jetbrains.kotlin.incremental.LookupStorage.addFileIfNeeded(LookupStorage.kt:165)
-	at org.jetbrains.kotlin.incremental.LookupStorage.addAll$lambda$4(LookupStorage.kt:117)
-	at org.jetbrains.kotlin.utils.CollectionsKt.keysToMap(collections.kt:117)
-	at org.jetbrains.kotlin.incremental.LookupStorage.addAll(LookupStorage.kt:117)
-	at org.jetbrains.kotlin.incremental.BuildUtilKt.update(buildUtil.kt:134)
-	at com.google.devtools.ksp.LookupStorageWrapperImpl.update(IncrementalContext.kt:231)
-	at com.google.devtools.ksp.common.IncrementalContextBase.updateLookupCache(IncrementalContextBase.kt:133)
-	at com.google.devtools.ksp.common.IncrementalContextBase.updateCaches(IncrementalContextBase.kt:365)
-	at com.google.devtools.ksp.common.IncrementalContextBase.updateCachesAndOutputs(IncrementalContextBase.kt:471)
-	at com.google.devtools.ksp.AbstractKotlinSymbolProcessingExtension.doAnalysis(KotlinSymbolProcessingExtension.kt:362)
-	at org.jetbrains.kotlin.cli.jvm.compiler.TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(TopDownAnalyzerFacadeForJVM.kt:112)
-	at org.jetbrains.kotlin.cli.jvm.compiler.TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration$default(TopDownAnalyzerFacadeForJVM.kt:75)
-	at org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler.analyze$lambda$12(KotlinToJVMBytecodeCompiler.kt:373)
-	at org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport.analyzeAndReport(AnalyzerWithCompilerReport.kt:112)
-	at org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler.analyze(KotlinToJVMBytecodeCompiler.kt:364)
-	at org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler.repeatAnalysisIfNeeded(KotlinToJVMBytecodeCompiler.kt:282)
-	at org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler.runFrontendAndGenerateIrUsingClassicFrontend(KotlinToJVMBytecodeCompiler.kt:195)
-	at org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler.compileModules$cli(KotlinToJVMBytecodeCompiler.kt:106)
-	at org.jetbrains.kotlin.cli.jvm.K2JVMCompiler.doExecute(K2JVMCompiler.kt:170)
-	at org.jetbrains.kotlin.cli.jvm.K2JVMCompiler.doExecute(K2JVMCompiler.kt:43)
-	at org.jetbrains.kotlin.cli.common.CLICompiler.execImpl(CLICompiler.kt:103)
-	at org.jetbrains.kotlin.cli.common.CLICompiler.execImpl(CLICompiler.kt:49)
-	at org.jetbrains.kotlin.cli.common.CLITool.exec(CLITool.kt:101)
-	at org.jetbrains.kotlin.daemon.CompileServiceImpl.compile(CompileServiceImpl.kt:1555)
-	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
-	at java.rmi/sun.rmi.server.UnicastServerRef.dispatch(UnicastServerRef.java:360)
-	at java.rmi/sun.rmi.transport.Transport$1.run(Transport.java:200)
-	at java.rmi/sun.rmi.transport.Transport$1.run(Transport.java:197)
-	at java.base/java.security.AccessController.doPrivileged(AccessController.java:714)
-	at java.rmi/sun.rmi.transport.Transport.serviceCall(Transport.java:196)
-	at java.rmi/sun.rmi.transport.tcp.TCPTransport.handleMessages(TCPTransport.java:598)
-	at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(TCPTransport.java:844)
-	at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.lambda$run$0(TCPTransport.java:721)
-	at java.base/java.security.AccessController.doPrivileged(AccessController.java:400)
-	at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(TCPTransport.java:720)
-	at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1144)
-	at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:642)
-	at java.base/java.lang.Thread.run(Thread.java:1583)
-	Suppressed: java.lang.Exception: Storage[/Users/atridad/Developer/personal/OpenClimb/app/build/kspCaches/debug/symbolLookups/id-to-file.tab] registration stack trace
-		at org.jetbrains.kotlin.com.intellij.util.io.FilePageCache.registerPagedFileStorage(FilePageCache.java:437)
-		at org.jetbrains.kotlin.com.intellij.util.io.PagedFileStorage.<init>(PagedFileStorage.java:72)
-		at org.jetbrains.kotlin.com.intellij.util.io.ResizeableMappedFile.<init>(ResizeableMappedFile.java:55)
-		at org.jetbrains.kotlin.com.intellij.util.io.PersistentBTreeEnumerator.<init>(PersistentBTreeEnumerator.java:128)
-		at org.jetbrains.kotlin.com.intellij.util.io.PersistentEnumerator.createDefaultEnumerator(PersistentEnumerator.java:52)
-		at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.<init>(PersistentMapImpl.java:165)
-		at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.<init>(PersistentMapImpl.java:140)
-		at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapBuilder.buildImplementation(PersistentMapBuilder.java:88)
-		at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapBuilder.build(PersistentMapBuilder.java:71)
-		at org.jetbrains.kotlin.com.intellij.util.io.PersistentHashMap.<init>(PersistentHashMap.java:45)
-		at org.jetbrains.kotlin.com.intellij.util.io.PersistentHashMap.<init>(PersistentHashMap.java:71)
-		at org.jetbrains.kotlin.incremental.storage.LazyStorage.createMap(LazyStorage.kt:62)
-		at org.jetbrains.kotlin.incremental.storage.LazyStorage.getStorageIfExists(LazyStorage.kt:53)
-		at org.jetbrains.kotlin.incremental.storage.LazyStorage.get(LazyStorage.kt:76)
-		at org.jetbrains.kotlin.incremental.storage.PersistentStorageWrapper.get(PersistentStorage.kt:92)
-		at org.jetbrains.kotlin.incremental.LookupStorage.get(LookupStorage.kt:99)
-		at com.google.devtools.ksp.LookupStorageWrapperImpl.get(IncrementalContext.kt:224)
-		at com.google.devtools.ksp.common.IncrementalContextBase.calcDirtyFiles(IncrementalContextBase.kt:234)
-		at com.google.devtools.ksp.AbstractKotlinSymbolProcessingExtension$doAnalysis$2.invoke(KotlinSymbolProcessingExtension.kt:196)
-		at com.google.devtools.ksp.AbstractKotlinSymbolProcessingExtension$doAnalysis$2.invoke(KotlinSymbolProcessingExtension.kt:189)
-		at com.google.devtools.ksp.AbstractKotlinSymbolProcessingExtension.handleException(KotlinSymbolProcessingExtension.kt:414)
-		at com.google.devtools.ksp.AbstractKotlinSymbolProcessingExtension.doAnalysis(KotlinSymbolProcessingExtension.kt:189)
-		at org.jetbrains.kotlin.cli.jvm.compiler.TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(TopDownAnalyzerFacadeForJVM.kt:112)
-		at org.jetbrains.kotlin.cli.jvm.compiler.TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration$default(TopDownAnalyzerFacadeForJVM.kt:75)
-		at org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler.analyze$lambda$12(KotlinToJVMBytecodeCompiler.kt:373)
-		at org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport.analyzeAndReport(AnalyzerWithCompilerReport.kt:112)
-		at org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler.analyze(KotlinToJVMBytecodeCompiler.kt:364)
-		... 23 more
-
-

.kotlin/errors/errors-1755282407075.log

@@ -1,87 +0,0 @@
-kotlin version: 2.0.21
-error message: java.lang.IllegalStateException: Storage for [/Users/atridad/Developer/personal/OpenClimb/app/build/kspCaches/debug/symbolLookups/id-to-file.tab] is already registered
-	at org.jetbrains.kotlin.com.intellij.util.io.FilePageCache.registerPagedFileStorage(FilePageCache.java:410)
-	at org.jetbrains.kotlin.com.intellij.util.io.PagedFileStorage.<init>(PagedFileStorage.java:72)
-	at org.jetbrains.kotlin.com.intellij.util.io.ResizeableMappedFile.<init>(ResizeableMappedFile.java:55)
-	at org.jetbrains.kotlin.com.intellij.util.io.PersistentBTreeEnumerator.<init>(PersistentBTreeEnumerator.java:128)
-	at org.jetbrains.kotlin.com.intellij.util.io.PersistentEnumerator.createDefaultEnumerator(PersistentEnumerator.java:52)
-	at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.<init>(PersistentMapImpl.java:165)
-	at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.<init>(PersistentMapImpl.java:140)
-	at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapBuilder.buildImplementation(PersistentMapBuilder.java:88)
-	at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapBuilder.build(PersistentMapBuilder.java:71)
-	at org.jetbrains.kotlin.com.intellij.util.io.PersistentHashMap.<init>(PersistentHashMap.java:45)
-	at org.jetbrains.kotlin.com.intellij.util.io.PersistentHashMap.<init>(PersistentHashMap.java:71)
-	at org.jetbrains.kotlin.incremental.storage.LazyStorage.createMap(LazyStorage.kt:62)
-	at org.jetbrains.kotlin.incremental.storage.LazyStorage.getStorageOrCreateNew(LazyStorage.kt:59)
-	at org.jetbrains.kotlin.incremental.storage.LazyStorage.set(LazyStorage.kt:80)
-	at org.jetbrains.kotlin.incremental.storage.PersistentStorageWrapper.set(PersistentStorage.kt:96)
-	at org.jetbrains.kotlin.incremental.LookupStorage.addFileIfNeeded(LookupStorage.kt:165)
-	at org.jetbrains.kotlin.incremental.LookupStorage.addAll$lambda$4(LookupStorage.kt:117)
-	at org.jetbrains.kotlin.utils.CollectionsKt.keysToMap(collections.kt:117)
-	at org.jetbrains.kotlin.incremental.LookupStorage.addAll(LookupStorage.kt:117)
-	at org.jetbrains.kotlin.incremental.BuildUtilKt.update(buildUtil.kt:134)
-	at com.google.devtools.ksp.LookupStorageWrapperImpl.update(IncrementalContext.kt:231)
-	at com.google.devtools.ksp.common.IncrementalContextBase.updateLookupCache(IncrementalContextBase.kt:133)
-	at com.google.devtools.ksp.common.IncrementalContextBase.updateCaches(IncrementalContextBase.kt:365)
-	at com.google.devtools.ksp.common.IncrementalContextBase.updateCachesAndOutputs(IncrementalContextBase.kt:471)
-	at com.google.devtools.ksp.AbstractKotlinSymbolProcessingExtension.doAnalysis(KotlinSymbolProcessingExtension.kt:362)
-	at org.jetbrains.kotlin.cli.jvm.compiler.TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(TopDownAnalyzerFacadeForJVM.kt:112)
-	at org.jetbrains.kotlin.cli.jvm.compiler.TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration$default(TopDownAnalyzerFacadeForJVM.kt:75)
-	at org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler.analyze$lambda$12(KotlinToJVMBytecodeCompiler.kt:373)
-	at org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport.analyzeAndReport(AnalyzerWithCompilerReport.kt:112)
-	at org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler.analyze(KotlinToJVMBytecodeCompiler.kt:364)
-	at org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler.repeatAnalysisIfNeeded(KotlinToJVMBytecodeCompiler.kt:282)
-	at org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler.runFrontendAndGenerateIrUsingClassicFrontend(KotlinToJVMBytecodeCompiler.kt:195)
-	at org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler.compileModules$cli(KotlinToJVMBytecodeCompiler.kt:106)
-	at org.jetbrains.kotlin.cli.jvm.K2JVMCompiler.doExecute(K2JVMCompiler.kt:170)
-	at org.jetbrains.kotlin.cli.jvm.K2JVMCompiler.doExecute(K2JVMCompiler.kt:43)
-	at org.jetbrains.kotlin.cli.common.CLICompiler.execImpl(CLICompiler.kt:103)
-	at org.jetbrains.kotlin.cli.common.CLICompiler.execImpl(CLICompiler.kt:49)
-	at org.jetbrains.kotlin.cli.common.CLITool.exec(CLITool.kt:101)
-	at org.jetbrains.kotlin.daemon.CompileServiceImpl.compile(CompileServiceImpl.kt:1555)
-	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
-	at java.rmi/sun.rmi.server.UnicastServerRef.dispatch(UnicastServerRef.java:360)
-	at java.rmi/sun.rmi.transport.Transport$1.run(Transport.java:200)
-	at java.rmi/sun.rmi.transport.Transport$1.run(Transport.java:197)
-	at java.base/java.security.AccessController.doPrivileged(AccessController.java:714)
-	at java.rmi/sun.rmi.transport.Transport.serviceCall(Transport.java:196)
-	at java.rmi/sun.rmi.transport.tcp.TCPTransport.handleMessages(TCPTransport.java:598)
-	at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(TCPTransport.java:844)
-	at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.lambda$run$0(TCPTransport.java:721)
-	at java.base/java.security.AccessController.doPrivileged(AccessController.java:400)
-	at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(TCPTransport.java:720)
-	at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1144)
-	at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:642)
-	at java.base/java.lang.Thread.run(Thread.java:1583)
-	Suppressed: java.lang.Exception: Storage[/Users/atridad/Developer/personal/OpenClimb/app/build/kspCaches/debug/symbolLookups/id-to-file.tab] registration stack trace
-		at org.jetbrains.kotlin.com.intellij.util.io.FilePageCache.registerPagedFileStorage(FilePageCache.java:437)
-		at org.jetbrains.kotlin.com.intellij.util.io.PagedFileStorage.<init>(PagedFileStorage.java:72)
-		at org.jetbrains.kotlin.com.intellij.util.io.ResizeableMappedFile.<init>(ResizeableMappedFile.java:55)
-		at org.jetbrains.kotlin.com.intellij.util.io.PersistentBTreeEnumerator.<init>(PersistentBTreeEnumerator.java:128)
-		at org.jetbrains.kotlin.com.intellij.util.io.PersistentEnumerator.createDefaultEnumerator(PersistentEnumerator.java:52)
-		at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.<init>(PersistentMapImpl.java:165)
-		at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.<init>(PersistentMapImpl.java:140)
-		at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapBuilder.buildImplementation(PersistentMapBuilder.java:88)
-		at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapBuilder.build(PersistentMapBuilder.java:71)
-		at org.jetbrains.kotlin.com.intellij.util.io.PersistentHashMap.<init>(PersistentHashMap.java:45)
-		at org.jetbrains.kotlin.com.intellij.util.io.PersistentHashMap.<init>(PersistentHashMap.java:71)
-		at org.jetbrains.kotlin.incremental.storage.LazyStorage.createMap(LazyStorage.kt:62)
-		at org.jetbrains.kotlin.incremental.storage.LazyStorage.getStorageIfExists(LazyStorage.kt:53)
-		at org.jetbrains.kotlin.incremental.storage.LazyStorage.get(LazyStorage.kt:76)
-		at org.jetbrains.kotlin.incremental.storage.PersistentStorageWrapper.get(PersistentStorage.kt:92)
-		at org.jetbrains.kotlin.incremental.LookupStorage.get(LookupStorage.kt:99)
-		at com.google.devtools.ksp.LookupStorageWrapperImpl.get(IncrementalContext.kt:224)
-		at com.google.devtools.ksp.common.IncrementalContextBase.calcDirtyFiles(IncrementalContextBase.kt:234)
-		at com.google.devtools.ksp.AbstractKotlinSymbolProcessingExtension$doAnalysis$2.invoke(KotlinSymbolProcessingExtension.kt:196)
-		at com.google.devtools.ksp.AbstractKotlinSymbolProcessingExtension$doAnalysis$2.invoke(KotlinSymbolProcessingExtension.kt:189)
-		at com.google.devtools.ksp.AbstractKotlinSymbolProcessingExtension.handleException(KotlinSymbolProcessingExtension.kt:414)
-		at com.google.devtools.ksp.AbstractKotlinSymbolProcessingExtension.doAnalysis(KotlinSymbolProcessingExtension.kt:189)
-		at org.jetbrains.kotlin.cli.jvm.compiler.TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(TopDownAnalyzerFacadeForJVM.kt:112)
-		at org.jetbrains.kotlin.cli.jvm.compiler.TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration$default(TopDownAnalyzerFacadeForJVM.kt:75)
-		at org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler.analyze$lambda$12(KotlinToJVMBytecodeCompiler.kt:373)
-		at org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport.analyzeAndReport(AnalyzerWithCompilerReport.kt:112)
-		at org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler.analyze(KotlinToJVMBytecodeCompiler.kt:364)
-		... 23 more
-
-

.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-    "java.configuration.updateBuildConfiguration": "disabled"
-}

README.md

@@ -7,7 +7,7 @@ This is a FOSS Android app meant to help climbers track their sessions, routes/p
 You have two options:
 
 1. Download the latest APK from the Released page
-2. Use <a href="">Obtainium</a>
+2. Use <a href="https://apps.obtainium.imranr.dev/redirect?r=obtainium://app/%7B%22id%22%3A%22com.atridad.openclimb%22%2C%22url%22%3A%22https%3A%2F%2Fgit.atri.dad%2Fatridad%2FOpenClimb%2Freleases%22%2C%22author%22%3A%22git.atri.dad%22%2C%22name%22%3A%22OpenClimb%22%2C%22preferredApkIndex%22%3A0%2C%22additionalSettings%22%3A%22%7B%5C%22intermediateLink%5C%22%3A%5B%5D%2C%5C%22customLinkFilterRegex%5C%22%3A%5C%22%5C%22%2C%5C%22filterByLinkText%5C%22%3Afalse%2C%5C%22skipSort%5C%22%3Afalse%2C%5C%22reverseSort%5C%22%3Afalse%2C%5C%22sortByLastLinkSegment%5C%22%3Afalse%2C%5C%22versionExtractWholePage%5C%22%3Afalse%2C%5C%22requestHeader%5C%22%3A%5B%7B%5C%22requestHeader%5C%22%3A%5C%22User-Agent%3A%20Mozilla%2F5.0%20(Linux%3B%20Android%2010%3B%20K)%20AppleWebKit%2F537.36%20(KHTML%2C%20like%20Gecko)%20Chrome%2F114.0.0.0%20Mobile%20Safari%2F537.36%5C%22%7D%5D%2C%5C%22defaultPseudoVersioningMethod%5C%22%3A%5C%22partialAPKHash%5C%22%2C%5C%22trackOnly%5C%22%3Afalse%2C%5C%22versionExtractionRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22matchGroupToUse%5C%22%3A%5C%22%5C%22%2C%5C%22versionDetection%5C%22%3Afalse%2C%5C%22useVersionCodeAsOSVersion%5C%22%3Afalse%2C%5C%22apkFilterRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22invertAPKFilter%5C%22%3Afalse%2C%5C%22autoApkFilterByArch%5C%22%3Atrue%2C%5C%22appName%5C%22%3A%5C%22OpenClimb%5C%22%2C%5C%22appAuthor%5C%22%3A%5C%22%5C%22%2C%5C%22shizukuPretendToBeGooglePlay%5C%22%3Afalse%2C%5C%22allowInsecure%5C%22%3Afalse%2C%5C%22exemptFromBackgroundUpdates%5C%22%3Afalse%2C%5C%22skipUpdateNotifications%5C%22%3Afalse%2C%5C%22about%5C%22%3A%5C%22%5C%22%2C%5C%22refreshBeforeDownload%5C%22%3Afalse%7D%22%2C%22overrideSource%22%3Anull%7D">Obtainium</a>
 
 ## Requirements
 

app/build.gradle.kts

@@ -14,8 +14,8 @@ android {
         applicationId = "com.atridad.openclimb"
         minSdk = 31
         targetSdk = 35
-        versionCode = 5
-        versionName = "0.3.2"
+        versionCode = 9
+        versionName = "0.4.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

app/release/output-metadata.json

@@ -1,37 +0,0 @@
-{
-  "version": 3,
-  "artifactType": {
-    "type": "APK",
-    "kind": "Directory"
-  },
-  "applicationId": "com.atridad.openclimb",
-  "variantName": "release",
-  "elements": [
-    {
-      "type": "SINGLE",
-      "filters": [],
-      "attributes": [],
-      "versionCode": 4,
-      "versionName": "0.3.1",
-      "outputFile": "app-release.apk"
-    }
-  ],
-  "elementType": "File",
-  "baselineProfiles": [
-    {
-      "minApi": 28,
-      "maxApi": 30,
-      "baselineProfiles": [
-        "baselineProfiles/1/app-release.dm"
-      ]
-    },
-    {
-      "minApi": 31,
-      "maxApi": 2147483647,
-      "baselineProfiles": [
-        "baselineProfiles/0/app-release.dm"
-      ]
-    }
-  ],
-  "minSdkVersionForDexing": 31
-}

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

@@ -9,12 +9,10 @@ import java.time.LocalDateTime
 
 @Serializable
 enum class AttemptResult {
-    SUCCESS,        // Completed the problem/route
-    FALL,          // Fell but made progress
-    NO_PROGRESS,   // Couldn't make meaningful progress
-    FLASH,         // Completed on first try
-    REDPOINT,      // Completed after previous attempts
-    ONSIGHT        // Completed on first try without prior knowledge
+    SUCCESS,
+    FALL,
+    NO_PROGRESS,
+    FLASH,
 }
 
 @Entity(

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

@@ -65,7 +65,7 @@ data class ClimbSession(
                     val start = LocalDateTime.parse(startTime)
                     val end = LocalDateTime.parse(endTime)
                     java.time.Duration.between(start, end).toMinutes()
-                } catch (e: Exception) {
+                } catch (_: Exception) {
                     null
                 }
             } else null

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

@@ -68,4 +68,41 @@ data class DifficultyGrade(
     val system: DifficultySystem,
     val grade: String,
     val numericValue: Int
-)
+) {
+    /**
+     * Compare this grade with another grade of the same system
+     * Returns negative if this grade is easier, positive if harder, 0 if equal
+     */
+    fun compareTo(other: DifficultyGrade): Int {
+        if (system != other.system) return 0
+        
+        return when (system) {
+            DifficultySystem.V_SCALE -> compareVScaleGrades(grade, other.grade)
+            DifficultySystem.FONT -> compareFontGrades(grade, other.grade)
+            DifficultySystem.YDS -> compareYDSGrades(grade, other.grade)
+            DifficultySystem.CUSTOM -> grade.compareTo(other.grade)
+        }
+    }
+    
+    private fun compareVScaleGrades(grade1: String, grade2: String): Int {
+        // Handle VB (easiest) specially
+        if (grade1 == "VB" && grade2 != "VB") return -1
+        if (grade2 == "VB" && grade1 != "VB") return 1
+        if (grade1 == "VB" && grade2 == "VB") return 0
+        
+        // Extract numeric values for V grades
+        val num1 = grade1.removePrefix("V").toIntOrNull() ?: 0
+        val num2 = grade2.removePrefix("V").toIntOrNull() ?: 0
+        return num1.compareTo(num2)
+    }
+    
+    private fun compareFontGrades(grade1: String, grade2: String): Int {
+        // Simple string comparison for Font grades
+        return grade1.compareTo(grade2)
+    }
+    
+    private fun compareYDSGrades(grade1: String, grade2: String): Int {
+        // Simple string comparison for YDS grades
+        return grade1.compareTo(grade2)
+    }
+}

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

@@ -123,7 +123,7 @@ class ClimbRepository(
             importData.gyms.forEach { gym ->
                 try {
                     gymDao.insertGym(gym)
-                } catch (e: Exception) {
+                } catch (_: Exception) {
                     // If insertion fails, update instead
                     gymDao.updateGym(gym)
                 }
@@ -133,7 +133,7 @@ class ClimbRepository(
             importData.problems.forEach { problem ->
                 try {
                     problemDao.insertProblem(problem)
-                } catch (e: Exception) {
+                } catch (_: Exception) {
                     problemDao.updateProblem(problem)
                 }
             }
@@ -142,7 +142,7 @@ class ClimbRepository(
             importData.sessions.forEach { session ->
                 try {
                     sessionDao.insertSession(session)
-                } catch (e: Exception) {
+                } catch (_: Exception) {
                     sessionDao.updateSession(session)
                 }
             }
@@ -151,7 +151,7 @@ class ClimbRepository(
             importData.attempts.forEach { attempt ->
                 try {
                     attemptDao.insertAttempt(attempt)
-                } catch (e: Exception) {
+                } catch (_: Exception) {
                     attemptDao.updateAttempt(attempt)
                 }
             }

app/src/main/java/com/atridad/openclimb/service/SessionTrackingService.kt

@@ -38,9 +38,10 @@ class SessionTrackingService : Service() {
             }
         }
         
-        fun createStopIntent(context: Context): Intent {
+        fun createStopIntent(context: Context, sessionId: String): Intent {
             return Intent(context, SessionTrackingService::class.java).apply {
                 action = ACTION_STOP_SESSION
+                putExtra(EXTRA_SESSION_ID, sessionId)
             }
         }
     }
@@ -63,7 +64,21 @@ class SessionTrackingService : Service() {
                 }
             }
             ACTION_STOP_SESSION -> {
-                stopSessionTracking()
+                val sessionId = intent.getStringExtra(EXTRA_SESSION_ID)
+                serviceScope.launch {
+                    try {
+                        val targetSession = when {
+                            sessionId != null -> repository.getSessionById(sessionId)
+                            else -> repository.getActiveSession()
+                        }
+                        if (targetSession != null && targetSession.status == com.atridad.openclimb.data.model.SessionStatus.ACTIVE) {
+                            val completed = with(com.atridad.openclimb.data.model.ClimbSession) { targetSession.complete() }
+                            repository.updateSession(completed)
+                        }
+                    } finally {
+                        stopSessionTracking()
+                    }
+                }
             }
         }
         return START_STICKY
@@ -74,9 +89,13 @@ class SessionTrackingService : Service() {
     private fun startSessionTracking(sessionId: String) {
         notificationJob?.cancel()
         notificationJob = serviceScope.launch {
+            // Initial notification update
+            updateNotification(sessionId)
+            
+            // Then update every second
             while (isActive) {
+                delay(1000L)
                 updateNotification(sessionId)
-                delay(1000)
             }
         }
     }
@@ -102,14 +121,15 @@ class SessionTrackingService : Service() {
                 try {
                     val start = LocalDateTime.parse(startTime)
                     val now = LocalDateTime.now()
-                    val minutes = ChronoUnit.MINUTES.between(start, now)
-                    val hours = minutes / 60
-                    val remainingMinutes = minutes % 60
+                    val totalSeconds = ChronoUnit.SECONDS.between(start, now)
+                    val hours = totalSeconds / 3600
+                    val minutes = (totalSeconds % 3600) / 60
+                    val seconds = totalSeconds % 60
                     
                     when {
-                        hours > 0 -> "${hours}h ${remainingMinutes}m"
-                        remainingMinutes > 0 -> "${remainingMinutes}m"
-                        else -> "< 1m"
+                        hours > 0 -> "${hours}h ${minutes}m ${seconds}s"
+                        minutes > 0 -> "${minutes}m ${seconds}s"
+                        else -> "${totalSeconds}s"
                     }
                 } catch (_: Exception) {
                     "Active"
@@ -131,10 +151,14 @@ class SessionTrackingService : Service() {
                 .addAction(
                     android.R.drawable.ic_menu_close_clear_cancel,
                     "End Session",
-                    createStopIntent()
+                    createStopPendingIntent(sessionId)
                 )
                 .build()
             
+            // Force update the notification every second
+            val notificationManager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager
+            notificationManager.notify(NOTIFICATION_ID, notification)
+            
             startForeground(NOTIFICATION_ID, notification)
         } catch (_: Exception) {
             // Handle errors gracefully
@@ -154,8 +178,8 @@ class SessionTrackingService : Service() {
         )
     }
     
-    private fun createStopIntent(): PendingIntent {
-        val intent = createStopIntent(this)
+    private fun createStopPendingIntent(sessionId: String): PendingIntent {
+        val intent = createStopIntent(this, sessionId)
         return PendingIntent.getService(
             this,
             1,

app/src/main/java/com/atridad/openclimb/ui/OpenClimbApp.kt

@@ -27,7 +27,6 @@ import com.atridad.openclimb.ui.viewmodel.ClimbViewModelFactory
 fun OpenClimbApp() {
     val navController = rememberNavController()
     val context = LocalContext.current
-    val currentBackStackEntry by navController.currentBackStackEntryAsState()
     
     val database = remember { OpenClimbDatabase.getDatabase(context) }
     val repository = remember { ClimbRepository(database, context) }
@@ -148,18 +147,17 @@ fun OpenClimbApp() {
             // Detail screens
             composable<Screen.SessionDetail> { backStackEntry ->
                 val args = backStackEntry.toRoute<Screen.SessionDetail>()
+                LaunchedEffect(Unit) { fabConfig = null }
                 SessionDetailScreen(
                     sessionId = args.sessionId,
                     viewModel = viewModel,
-                    onNavigateBack = { navController.popBackStack() },
-                    onNavigateToEdit = { sessionId ->
-                        navController.navigate(Screen.AddEditSession(sessionId = sessionId))
-                    }
+                    onNavigateBack = { navController.popBackStack() }
                 )
             }
             
             composable<Screen.ProblemDetail> { backStackEntry ->
                 val args = backStackEntry.toRoute<Screen.ProblemDetail>()
+                LaunchedEffect(Unit) { fabConfig = null }
                 ProblemDetailScreen(
                     problemId = args.problemId,
                     viewModel = viewModel,
@@ -172,6 +170,7 @@ fun OpenClimbApp() {
             
             composable<Screen.GymDetail> { backStackEntry ->
                 val args = backStackEntry.toRoute<Screen.GymDetail>()
+                LaunchedEffect(Unit) { fabConfig = null }
                 GymDetailScreen(
                     gymId = args.gymId,
                     viewModel = viewModel,
@@ -185,6 +184,7 @@ fun OpenClimbApp() {
 
             composable<Screen.AddEditGym> { backStackEntry ->
                 val args = backStackEntry.toRoute<Screen.AddEditGym>()
+                LaunchedEffect(Unit) { fabConfig = null }
                 AddEditGymScreen(
                     gymId = args.gymId,
                     viewModel = viewModel,
@@ -194,6 +194,7 @@ fun OpenClimbApp() {
             
             composable<Screen.AddEditProblem> { backStackEntry ->
                 val args = backStackEntry.toRoute<Screen.AddEditProblem>()
+                LaunchedEffect(Unit) { fabConfig = null }
                 AddEditProblemScreen(
                     problemId = args.problemId,
                     gymId = args.gymId,
@@ -204,6 +205,7 @@ fun OpenClimbApp() {
             
             composable<Screen.AddEditSession> { backStackEntry ->
                 val args = backStackEntry.toRoute<Screen.AddEditSession>()
+                LaunchedEffect(Unit) { fabConfig = null }
                 AddEditSessionScreen(
                     sessionId = args.sessionId,
                     gymId = args.gymId,

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

@@ -15,6 +15,7 @@ import com.atridad.openclimb.data.model.ClimbSession
 import com.atridad.openclimb.data.model.Gym
 import java.time.LocalDateTime
 import java.time.temporal.ChronoUnit
+import kotlinx.coroutines.delay
 
 @Composable
 fun ActiveSessionBanner(
@@ -24,6 +25,16 @@ fun ActiveSessionBanner(
     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()
+            }
+        }
+        
         Card(
             modifier = Modifier
                 .fillMaxWidth()
@@ -67,7 +78,7 @@ fun ActiveSessionBanner(
                     )
                     
                     activeSession.startTime?.let { startTime ->
-                        val duration = calculateDuration(startTime)
+                        val duration = calculateDuration(startTime, currentTime)
                         Text(
                             text = duration,
                             style = MaterialTheme.typography.bodySmall,
@@ -93,18 +104,18 @@ fun ActiveSessionBanner(
     }
 }
 
-private fun calculateDuration(startTimeString: String): String {
+private fun calculateDuration(startTimeString: String, currentTime: LocalDateTime): String {
     return try {
         val startTime = LocalDateTime.parse(startTimeString)
-        val now = LocalDateTime.now()
-        val minutes = ChronoUnit.MINUTES.between(startTime, now)
-        val hours = minutes / 60
-        val remainingMinutes = minutes % 60
+        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 ${remainingMinutes}m"
-            remainingMinutes > 0 -> "${remainingMinutes}m"
-            else -> "< 1m"
+            hours > 0 -> "${hours}h ${minutes}m ${seconds}s"
+            minutes > 0 -> "${minutes}m ${seconds}s"
+            else -> "${totalSeconds}s"
         }
     } catch (_: Exception) {
         "Active"

app/src/main/java/com/atridad/openclimb/ui/screens/AddEditScreens.kt

@@ -5,11 +5,9 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.selection.selectable
-import androidx.compose.foundation.selection.selectableGroup
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.filled.*
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
@@ -18,21 +16,12 @@ import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.window.Dialog
 import com.atridad.openclimb.data.model.*
 import com.atridad.openclimb.ui.components.ImagePicker
 import com.atridad.openclimb.ui.viewmodel.ClimbViewModel
 import kotlinx.coroutines.flow.first
 import java.time.LocalDateTime
 
-// Data class for attempt input
-data class AttemptInput(
-    val problemId: String,
-    val result: AttemptResult,
-    val highestHold: String = "",
-    val notes: String = ""
-)
-
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun AddEditGymScreen(
@@ -278,7 +267,6 @@ fun AddEditProblemScreen(
                 notes = p.notes ?: ""
                 isActive = p.isActive
                 imagePaths = p.imagePaths
-                // Set the selected gym for the existing problem
                 selectedGym = gyms.find { it.id == p.gymId }
             }
         }
@@ -700,18 +688,13 @@ fun AddEditSessionScreen(
 ) {
     val isEditing = sessionId != null
     val gyms by viewModel.gyms.collectAsState()
-    val problems by viewModel.problems.collectAsState()
-    
+
     // Session form state
     var selectedGym by remember { mutableStateOf<Gym?>(gymId?.let { id -> gyms.find { it.id == id } }) }
     var sessionDate by remember { mutableStateOf(LocalDateTime.now().toLocalDate().toString()) }
     var duration by remember { mutableStateOf("") }
     var sessionNotes by remember { mutableStateOf("") }
     
-    // Attempt tracking state
-    var attempts by remember { mutableStateOf(listOf<AttemptInput>()) }
-    var showAddAttemptDialog by remember { mutableStateOf(false) }
-    
     // Load existing session data for editing
     LaunchedEffect(sessionId) {
         if (sessionId != null) {
@@ -753,17 +736,6 @@ fun AddEditSessionScreen(
                                     viewModel.updateSession(session.copy(id = sessionId))
                                 } else {
                                     viewModel.addSession(session)
-                                    
-                                    attempts.forEach { attemptInput ->
-                                        val attempt = Attempt.create(
-                                            sessionId = session.id,
-                                            problemId = attemptInput.problemId,
-                                            result = attemptInput.result,
-                                            highestHold = attemptInput.highestHold.ifBlank { null },
-                                            notes = attemptInput.notes.ifBlank { null }
-                                        )
-                                        viewModel.addAttempt(attempt)
-                                    }
                                 }
                                 onNavigateBack()
                             }
@@ -774,15 +746,6 @@ fun AddEditSessionScreen(
                     }
                 }
             )
-        },
-        floatingActionButton = {
-            if (selectedGym != null) {
-                FloatingActionButton(
-                    onClick = { showAddAttemptDialog = true }
-                ) {
-                    Icon(Icons.Default.Add, contentDescription = "Add Attempt")
-                }
-            }
         }
     ) { paddingValues ->
         LazyColumn(
@@ -878,286 +841,9 @@ fun AddEditSessionScreen(
                     }
                 }
             }
-            
-            // Attempts Section
-            item {
-                Card(
-                    modifier = Modifier.fillMaxWidth()
-                ) {
-                    Column(
-                        modifier = Modifier.padding(16.dp)
-                    ) {
-                        Row(
-                            modifier = Modifier.fillMaxWidth(),
-                            horizontalArrangement = Arrangement.SpaceBetween,
-                            verticalAlignment = Alignment.CenterVertically
-                        ) {
-                            Text(
-                                text = "Attempts (${attempts.size})",
-                                style = MaterialTheme.typography.titleMedium,
-                                fontWeight = FontWeight.Bold
-                            )
-                            
-
-                        }
-                        
-                        if (attempts.isEmpty()) {
-                            Spacer(modifier = Modifier.height(8.dp))
-                            Text(
-                                text = "No attempts recorded yet. Add an attempt to track your progress.",
-                                style = MaterialTheme.typography.bodyMedium,
-                                color = MaterialTheme.colorScheme.onSurfaceVariant
-                            )
-                        }
-                    }
-                }
-            }
-            
-            // Attempts List
-            items(attempts.size) { index ->
-                val attempt = attempts[index]
-                val problem = problems.find { it.id == attempt.problemId }
-                
-                Card(
-                    modifier = Modifier.fillMaxWidth()
-                ) {
-                    Column(
-                        modifier = Modifier.padding(16.dp)
-                    ) {
-                        Row(
-                            modifier = Modifier.fillMaxWidth(),
-                            horizontalArrangement = Arrangement.SpaceBetween,
-                            verticalAlignment = Alignment.Top
-                        ) {
-                            Column(modifier = Modifier.weight(1f)) {
-                                Text(
-                                    text = problem?.name ?: "Unknown Problem",
-                                    style = MaterialTheme.typography.titleSmall,
-                                    fontWeight = FontWeight.Bold
-                                )
-                                
-                                problem?.difficulty?.let { difficulty ->
-                                    Text(
-                                        text = "${difficulty.system.getDisplayName()}: ${difficulty.grade}",
-                                        style = MaterialTheme.typography.bodySmall,
-                                        color = MaterialTheme.colorScheme.primary
-                                    )
-                                }
-                                
-                                Text(
-                                    text = "Result: ${attempt.result.name.lowercase().replaceFirstChar { it.uppercase() }}",
-                                    style = MaterialTheme.typography.bodyMedium,
-                                    color = when (attempt.result) {
-                                        AttemptResult.SUCCESS, AttemptResult.FLASH, 
-                                        AttemptResult.REDPOINT, AttemptResult.ONSIGHT -> MaterialTheme.colorScheme.primary
-                                        else -> MaterialTheme.colorScheme.onSurfaceVariant
-                                    }
-                                )
-                                
-                                if (attempt.highestHold.isNotBlank()) {
-                                    Text(
-                                        text = "Highest hold: ${attempt.highestHold}",
-                                        style = MaterialTheme.typography.bodySmall,
-                                        color = MaterialTheme.colorScheme.onSurfaceVariant
-                                    )
-                                }
-                                
-                                if (attempt.notes.isNotBlank()) {
-                                    Text(
-                                        text = attempt.notes,
-                                        style = MaterialTheme.typography.bodySmall,
-                                        color = MaterialTheme.colorScheme.onSurfaceVariant
-                                    )
-                                }
-                            }
-                            
-                            IconButton(
-                                onClick = {
-                                    attempts = attempts.toMutableList().apply { removeAt(index) }
-                                }
-                            ) {
-                                Icon(Icons.Default.Delete, contentDescription = "Remove attempt")
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-    
-    if (showAddAttemptDialog && selectedGym != null) {
-        AddAttemptDialog(
-            problems = problems.filter { it.gymId == selectedGym!!.id && it.isActive },
-            onDismiss = { showAddAttemptDialog = false },
-            onAddAttempt = { attemptInput ->
-                attempts = attempts + attemptInput
-                showAddAttemptDialog = false
-            }
-        )
-    }
-}
-
-
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun AddAttemptDialog(
-    problems: List<Problem>,
-    onDismiss: () -> Unit,
-    onAddAttempt: (AttemptInput) -> Unit
-) {
-    var selectedProblem by remember { mutableStateOf<Problem?>(null) }
-    var selectedResult by remember { mutableStateOf(AttemptResult.FALL) }
-    var highestHold by remember { mutableStateOf("") }
-    var notes by remember { mutableStateOf("") }
-    
-    Dialog(onDismissRequest = onDismiss) {
-        Card(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(16.dp)
-        ) {
-            Column(
-                modifier = Modifier.padding(24.dp),
-                verticalArrangement = Arrangement.spacedBy(16.dp)
-            ) {
-                Text(
-                    text = "Add Attempt",
-                    style = MaterialTheme.typography.headlineSmall,
-                    fontWeight = FontWeight.Bold
-                )
-                
-                // Problem Selection
-                Text(
-                    text = "Problem",
-                    style = MaterialTheme.typography.titleMedium,
-                    fontWeight = FontWeight.Medium
-                )
-                
-                if (problems.isEmpty()) {
-                    Text(
-                        text = "No active problems in this gym. Add some problems first.",
-                        style = MaterialTheme.typography.bodyMedium,
-                        color = MaterialTheme.colorScheme.error
-                    )
-                } else {
-                    LazyColumn(
-                        modifier = Modifier.height(120.dp),
-                        verticalArrangement = Arrangement.spacedBy(4.dp)
-                    ) {
-                        items(problems) { problem ->
-                            Card(
-                                onClick = { selectedProblem = problem },
-                                colors = CardDefaults.cardColors(
-                                    containerColor = if (selectedProblem?.id == problem.id) 
-                                        MaterialTheme.colorScheme.primaryContainer 
-                                    else MaterialTheme.colorScheme.surface
-                                ),
-                                modifier = Modifier.fillMaxWidth()
-                            ) {
-                                Column(
-                                    modifier = Modifier.padding(12.dp)
-                                ) {
-                                    Text(
-                                        text = problem.name ?: "Unnamed Problem",
-                                        style = MaterialTheme.typography.bodyMedium,
-                                        fontWeight = FontWeight.Medium
-                                    )
-                                    Text(
-                                        text = "${problem.difficulty.system.getDisplayName()}: ${problem.difficulty.grade}",
-                                        style = MaterialTheme.typography.bodySmall,
-                                        color = MaterialTheme.colorScheme.primary
-                                    )
-                                }
-                            }
-                        }
-                    }
-                }
-                
-                // Result Selection
-                Text(
-                    text = "Result",
-                    style = MaterialTheme.typography.titleMedium,
-                    fontWeight = FontWeight.Medium
-                )
-                
-                Column(modifier = Modifier.selectableGroup()) {
-                    AttemptResult.entries.forEach { result ->
-                        Row(
-                            verticalAlignment = Alignment.CenterVertically,
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .selectable(
-                                    selected = selectedResult == result,
-                                    onClick = { selectedResult = result },
-                                    role = Role.RadioButton
-                                )
-                        ) {
-                            RadioButton(
-                                selected = selectedResult == result,
-                                onClick = null
-                            )
-                            Spacer(modifier = Modifier.width(8.dp))
-                            Text(
-                                text = result.name.lowercase().replaceFirstChar { it.uppercase() },
-                                style = MaterialTheme.typography.bodyMedium
-                            )
-                        }
-                    }
-                }
-                
-                // Highest Hold
-                OutlinedTextField(
-                    value = highestHold,
-                    onValueChange = { highestHold = it },
-                    label = { Text("Highest Hold (Optional)") },
-                    modifier = Modifier.fillMaxWidth(),
-                    singleLine = true,
-                    placeholder = { Text("e.g., 'jugs near the top', 'crux move'") }
-                )
-                
-                // Notes
-                OutlinedTextField(
-                    value = notes,
-                    onValueChange = { notes = it },
-                    label = { Text("Notes (Optional)") },
-                    modifier = Modifier.fillMaxWidth(),
-                    minLines = 2,
-                    placeholder = { Text("e.g., 'need to work on heel hooks', 'pumped out'") }
-                )
-                
-                // Buttons
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.spacedBy(8.dp)
-                ) {
-                    TextButton(
-                        onClick = onDismiss,
-                        modifier = Modifier.weight(1f)
-                    ) {
-                        Text("Cancel")
-                    }
-                    
-                    Button(
-                        onClick = {
-                            selectedProblem?.let { problem ->
-                                onAddAttempt(
-                                    AttemptInput(
-                                        problemId = problem.id,
-                                        result = selectedResult,
-                                        highestHold = highestHold,
-                                        notes = notes
-                                    )
-                                )
-                            }
-                        },
-                        enabled = selectedProblem != null,
-                        modifier = Modifier.weight(1f)
-                    ) {
-                        Text("Add Attempt")
-                    }
-                }
-            }
         }
     }
 }
+
+
+

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

@@ -93,41 +93,6 @@ fun AnalyticsScreen(
             val recentSessions = sessions.take(5)
             RecentActivityCard(recentSessions = recentSessions.size)
         }
-        
-
-        item {
-            Card(
-                modifier = Modifier.fillMaxWidth()
-            ) {
-                Column(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(16.dp),
-                    horizontalAlignment = Alignment.CenterHorizontally
-                ) {
-                    Text(
-                        text = "Progress Charts",
-                        style = MaterialTheme.typography.titleMedium,
-                        fontWeight = FontWeight.Bold
-                    )
-                    
-                    Spacer(modifier = Modifier.height(8.dp))
-                    
-                    Text(
-                        text = "Detailed charts and analytics coming soon!",
-                        style = MaterialTheme.typography.bodyMedium,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant
-                    )
-                    
-                    Spacer(modifier = Modifier.height(16.dp))
-                    
-                    Text(
-                        text = "📊",
-                        style = MaterialTheme.typography.displaySmall
-                    )
-                }
-            }
-        }
     }
 }
 

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

@@ -175,8 +175,8 @@ class ClimbViewModel(
                 val completedSession = with(ClimbSession) { session.complete() }
                 repository.updateSession(completedSession)
                 
-                // Stop the tracking service
-                val serviceIntent = SessionTrackingService.createStopIntent(context)
+                // Stop the tracking service, passing the session id so service can finalize if needed
+                val serviceIntent = SessionTrackingService.createStopIntent(context, sessionId)
                 context.startService(serviceIntent)
                 
                 _uiState.value = _uiState.value.copy(
@@ -186,32 +186,6 @@ class ClimbViewModel(
         }
     }
     
-    fun pauseSession(sessionId: String) {
-        viewModelScope.launch {
-            val session = repository.getSessionById(sessionId)
-            if (session != null && session.status == SessionStatus.ACTIVE) {
-                val pausedSession = session.copy(
-                    status = SessionStatus.PAUSED,
-                    updatedAt = java.time.LocalDateTime.now().toString()
-                )
-                repository.updateSession(pausedSession)
-            }
-        }
-    }
-    
-    fun resumeSession(sessionId: String) {
-        viewModelScope.launch {
-            val session = repository.getSessionById(sessionId)
-            if (session != null && session.status == SessionStatus.PAUSED) {
-                val resumedSession = session.copy(
-                    status = SessionStatus.ACTIVE,
-                    updatedAt = java.time.LocalDateTime.now().toString()
-                )
-                repository.updateSession(resumedSession)
-            }
-        }
-    }
-    
     // Attempt operations
     fun addAttempt(attempt: Attempt) {
         viewModelScope.launch {
@@ -219,52 +193,24 @@ class ClimbViewModel(
         }
     }
     
-    fun updateAttempt(attempt: Attempt) {
-        viewModelScope.launch {
-            repository.updateAttempt(attempt)
-        }
-    }
-    
     fun deleteAttempt(attempt: Attempt) {
         viewModelScope.launch {
             repository.deleteAttempt(attempt)
         }
     }
     
+    fun updateAttempt(attempt: Attempt) {
+        viewModelScope.launch {
+            repository.updateAttempt(attempt)
+        }
+    }
+    
     fun getAttemptsBySession(sessionId: String): Flow<List<Attempt>> = 
         repository.getAttemptsBySession(sessionId)
     
     fun getAttemptsByProblem(problemId: String): Flow<List<Attempt>> = 
         repository.getAttemptsByProblem(problemId)
-    
 
-    
-    // Analytics operations
-    // fun getProblemProgress(problemId: String): Flow<ProblemProgress?> = 
-    //     repository.getProblemProgress(problemId)
-    
-    // fun getSessionSummary(sessionId: String): Flow<SessionSummary?> = 
-    //     repository.getSessionSummary(sessionId)
-    
-    // Export operations
-    fun exportData(context: Context, directory: File? = null) {
-        viewModelScope.launch {
-            try {
-                _uiState.value = _uiState.value.copy(isLoading = true)
-                val exportFile = repository.exportAllDataToJson(directory)
-                _uiState.value = _uiState.value.copy(
-                    isLoading = false,
-                    message = "Data exported to: ${exportFile.absolutePath}"
-                )
-            } catch (e: Exception) {
-                _uiState.value = _uiState.value.copy(
-                    isLoading = false,
-                    error = "Export failed: ${e.message}"
-                )
-            }
-        }
-    }
-    
     fun exportDataToUri(context: Context, uri: android.net.Uri) {
         viewModelScope.launch {
             try {
@@ -282,26 +228,7 @@ class ClimbViewModel(
             }
         }
     }
-    
-    // ZIP Export operations with images
-    fun exportDataToZip(context: Context, directory: File? = null) {
-        viewModelScope.launch {
-            try {
-                _uiState.value = _uiState.value.copy(isLoading = true)
-                val exportFile = repository.exportAllDataToZip(directory)
-                _uiState.value = _uiState.value.copy(
-                    isLoading = false,
-                    message = "Data with images exported to: ${exportFile.absolutePath}"
-                )
-            } catch (e: Exception) {
-                _uiState.value = _uiState.value.copy(
-                    isLoading = false,
-                    error = "Export failed: ${e.message}"
-                )
-            }
-        }
-    }
-    
+
     fun exportDataToZipUri(context: Context, uri: android.net.Uri) {
         viewModelScope.launch {
             try {
@@ -358,10 +285,6 @@ class ClimbViewModel(
         _uiState.value = _uiState.value.copy(error = message)
     }
     
-    // Search operations
-    fun searchGyms(query: String): Flow<List<Gym>> = repository.searchGyms(query)
-    fun searchProblems(query: String): Flow<List<Problem>> = repository.searchProblems(query)
-    
     // Share operations
     suspend fun generateSessionShareCard(
         context: Context,

app/src/main/java/com/atridad/openclimb/utils/ImageUtils.kt

@@ -35,34 +35,92 @@ object ImageUtils {
      */
     fun saveImageFromUri(context: Context, imageUri: Uri): String? {
         return try {
-            val inputStream = context.contentResolver.openInputStream(imageUri)
-            inputStream?.use { input ->
-                // Decode and compress the image
-                val originalBitmap = BitmapFactory.decodeStream(input)
-                val compressedBitmap = compressImage(originalBitmap)
-                
-                // Generate unique filename
-                val filename = "${UUID.randomUUID()}.jpg"
-                val imageFile = File(getImagesDirectory(context), filename)
-                
-                // Save compressed image
-                FileOutputStream(imageFile).use { output ->
-                    compressedBitmap.compress(Bitmap.CompressFormat.JPEG, IMAGE_QUALITY, output)
-                }
-                
-                // Clean up bitmaps
-                originalBitmap.recycle()
-                compressedBitmap.recycle()
-                
-                // Return relative path
-                "$IMAGES_DIR/$filename"
+            // Decode bitmap from a fresh stream to avoid mark/reset dependency
+            val originalBitmap = context.contentResolver.openInputStream(imageUri)?.use { input ->
+                BitmapFactory.decodeStream(input)
+            } ?: return null
+
+            val orientedBitmap = correctImageOrientation(context, imageUri, originalBitmap)
+            val compressedBitmap = compressImage(orientedBitmap)
+
+            // Generate unique filename
+            val filename = "${UUID.randomUUID()}.jpg"
+            val imageFile = File(getImagesDirectory(context), filename)
+
+            // Save compressed image
+            FileOutputStream(imageFile).use { output ->
+                compressedBitmap.compress(Bitmap.CompressFormat.JPEG, IMAGE_QUALITY, output)
             }
+
+            // Clean up bitmaps
+            originalBitmap.recycle()
+            if (orientedBitmap != originalBitmap) {
+                orientedBitmap.recycle()
+            }
+            compressedBitmap.recycle()
+
+            // Return relative path
+            "$IMAGES_DIR/$filename"
         } catch (e: Exception) {
             e.printStackTrace()
             null
         }
     }
     
+    /**
+     * Corrects image orientation based on EXIF data
+     */
+    private fun correctImageOrientation(context: Context, imageUri: Uri, bitmap: Bitmap): Bitmap {
+        return try {
+            val inputStream = context.contentResolver.openInputStream(imageUri)
+            inputStream?.use { input ->
+                val exif = android.media.ExifInterface(input)
+                val orientation = exif.getAttributeInt(
+                    android.media.ExifInterface.TAG_ORIENTATION,
+                    android.media.ExifInterface.ORIENTATION_NORMAL
+                )
+                
+                val matrix = android.graphics.Matrix()
+                when (orientation) {
+                    android.media.ExifInterface.ORIENTATION_ROTATE_90 -> {
+                        matrix.postRotate(90f)
+                    }
+                    android.media.ExifInterface.ORIENTATION_ROTATE_180 -> {
+                        matrix.postRotate(180f)
+                    }
+                    android.media.ExifInterface.ORIENTATION_ROTATE_270 -> {
+                        matrix.postRotate(270f)
+                    }
+                    android.media.ExifInterface.ORIENTATION_FLIP_HORIZONTAL -> {
+                        matrix.postScale(-1f, 1f)
+                    }
+                    android.media.ExifInterface.ORIENTATION_FLIP_VERTICAL -> {
+                        matrix.postScale(1f, -1f)
+                    }
+                    android.media.ExifInterface.ORIENTATION_TRANSPOSE -> {
+                        matrix.postRotate(90f)
+                        matrix.postScale(-1f, 1f)
+                    }
+                    android.media.ExifInterface.ORIENTATION_TRANSVERSE -> {
+                        matrix.postRotate(-90f)
+                        matrix.postScale(-1f, 1f)
+                    }
+                }
+                
+                if (matrix.isIdentity) {
+                    bitmap
+                } else {
+                    android.graphics.Bitmap.createBitmap(
+                        bitmap, 0, 0, bitmap.width, bitmap.height, matrix, true
+                    )
+                }
+            } ?: bitmap
+        } catch (e: Exception) {
+            e.printStackTrace()
+            bitmap
+        }
+    }
+    
     /**
      * Compresses and resizes an image bitmap
      */

app/src/main/java/com/atridad/openclimb/utils/SessionShareUtils.kt

@@ -24,7 +24,8 @@ object SessionShareUtils {
         val uniqueProblemsCompleted: Int,
         val averageGrade: String?,
         val sessionDuration: String,
-        val topResult: AttemptResult?
+        val topResult: AttemptResult?,
+        val topGrade: String?
     )
     
     fun calculateSessionStats(
@@ -34,9 +35,7 @@ object SessionShareUtils {
     ): SessionStats {
         val successfulResults = listOf(
             AttemptResult.SUCCESS, 
-            AttemptResult.FLASH, 
-            AttemptResult.REDPOINT, 
-            AttemptResult.ONSIGHT
+            AttemptResult.FLASH
         )
         
         val successfulAttempts = attempts.filter { it.result in successfulResults }
@@ -44,22 +43,39 @@ object SessionShareUtils {
         val uniqueCompletedProblems = successfulAttempts.map { it.problemId }.distinct()
         
         val attemptedProblems = problems.filter { it.id in uniqueProblems }
-        val averageGrade = if (attemptedProblems.isNotEmpty()) {
-            // This is a simplified average - in reality you'd need proper grade conversion
-            val gradeValues = attemptedProblems.mapNotNull { problem ->
-                problem.difficulty.grade.filter { it.isDigit() }.toIntOrNull()
-            }
-            if (gradeValues.isNotEmpty()) {
-                "V${gradeValues.average().roundToInt()}"
-            } else null
-        } else null
+        
+        // Calculate separate averages for different climbing types and difficulty systems
+        val boulderProblems = attemptedProblems.filter { it.climbType == ClimbType.BOULDER }
+        val ropeProblems = attemptedProblems.filter { it.climbType == ClimbType.ROPE }
+        
+        val boulderAverage = calculateAverageGrade(boulderProblems, "Boulder")
+        val ropeAverage = calculateAverageGrade(ropeProblems, "Rope")
+        
+        // Combine averages for display
+        val averageGrade = when {
+            boulderAverage != null && ropeAverage != null -> "$boulderAverage / $ropeAverage"
+            boulderAverage != null -> boulderAverage
+            ropeAverage != null -> ropeAverage
+            else -> null
+        }
+        
+        // Determine highest achieved grade (only from completed problems: SUCCESS or FLASH)
+        val completedProblems = problems.filter { it.id in uniqueCompletedProblems }
+        val completedBoulder = completedProblems.filter { it.climbType == ClimbType.BOULDER }
+        val completedRope = completedProblems.filter { it.climbType == ClimbType.ROPE }
+        val topBoulder = highestGradeForProblems(completedBoulder)
+        val topRope = highestGradeForProblems(completedRope)
+        val topGrade = when {
+            topBoulder != null && topRope != null -> "$topBoulder / $topRope"
+            topBoulder != null -> topBoulder
+            topRope != null -> topRope
+            else -> null
+        }
         
         val duration = if (session.duration != null) "${session.duration}m" else "Unknown"
         val topResult = attempts.maxByOrNull { 
             when (it.result) {
-                AttemptResult.ONSIGHT -> 5
-                AttemptResult.FLASH -> 4
-                AttemptResult.REDPOINT -> 3
+                AttemptResult.FLASH -> 3
                 AttemptResult.SUCCESS -> 2
                 AttemptResult.FALL -> 1
                 else -> 0
@@ -74,9 +90,80 @@ object SessionShareUtils {
             uniqueProblemsCompleted = uniqueCompletedProblems.size,
             averageGrade = averageGrade,
             sessionDuration = duration,
-            topResult = topResult
+            topResult = topResult,
+            topGrade = topGrade
         )
     }
+    
+    /**
+     * Calculate average grade for a specific set of problems, respecting their difficulty systems
+     */
+    private fun calculateAverageGrade(problems: List<Problem>, climbingType: String): String? {
+        if (problems.isEmpty()) return null
+        
+        // Group problems by difficulty system
+        val problemsBySystem = problems.groupBy { it.difficulty.system }
+        
+        val averages = mutableListOf<String>()
+        
+        problemsBySystem.forEach { (system, systemProblems) ->
+            when (system) {
+                DifficultySystem.V_SCALE -> {
+                    val gradeValues = systemProblems.mapNotNull { problem ->
+                        when {
+                            problem.difficulty.grade == "VB" -> 0
+                            else -> problem.difficulty.grade.removePrefix("V").toIntOrNull()
+                        }
+                    }
+                    if (gradeValues.isNotEmpty()) {
+                        val avg = gradeValues.average().roundToInt()
+                        averages.add(if (avg == 0) "VB" else "V$avg")
+                    }
+                }
+                DifficultySystem.FONT -> {
+                    val gradeValues = systemProblems.mapNotNull { problem ->
+                        // Extract numeric part from Font grades (e.g., "6A" -> 6, "7C+" -> 7)
+                        problem.difficulty.grade.filter { it.isDigit() }.toIntOrNull()
+                    }
+                    if (gradeValues.isNotEmpty()) {
+                        val avg = gradeValues.average().roundToInt()
+                        averages.add("$avg")
+                    }
+                }
+                DifficultySystem.YDS -> {
+                    val gradeValues = systemProblems.mapNotNull { problem ->
+                        // Extract numeric part from YDS grades (e.g., "5.10a" -> 5.10)
+                        val grade = problem.difficulty.grade
+                        if (grade.startsWith("5.")) {
+                            grade.substring(2).toDoubleOrNull()
+                        } else null
+                    }
+                    if (gradeValues.isNotEmpty()) {
+                        val avg = gradeValues.average()
+                        averages.add("5.${String.format("%.1f", avg)}")
+                    }
+                }
+                DifficultySystem.CUSTOM -> {
+                    // For custom systems, try to extract numeric values
+                    val gradeValues = systemProblems.mapNotNull { problem ->
+                        problem.difficulty.grade.filter { it.isDigit() || it == '.' || it == '-' }.toDoubleOrNull()
+                    }
+                    if (gradeValues.isNotEmpty()) {
+                        val avg = gradeValues.average()
+                        averages.add(String.format("%.1f", avg))
+                    }
+                }
+            }
+        }
+        
+        return if (averages.isNotEmpty()) {
+            if (averages.size == 1) {
+                averages.first()
+            } else {
+                averages.joinToString(" / ")
+            }
+        } else null
+    }
 
     fun generateShareCard(
         context: Context,
@@ -177,8 +264,8 @@ object SessionShareUtils {
             drawStatItem(canvas, width - columnWidth / 2f, rightY, "Completed", stats.uniqueProblemsCompleted.toString(), statLabelPaint, statValuePaint)
             rightY += 140f
             
-            stats.averageGrade?.let { grade ->
-                drawStatItem(canvas, width - columnWidth / 2f, rightY, "Avg Grade", grade, statLabelPaint, statValuePaint)
+            stats.topGrade?.let { grade ->
+                drawStatItem(canvas, width - columnWidth / 2f, rightY, "Top Grade", grade, statLabelPaint, statValuePaint)
             }
             
             // Success rate arc
@@ -311,4 +398,48 @@ object SessionShareUtils {
             e.printStackTrace()
         }
     }
+
+    /**
+     * Returns the highest grade string among the given problems, respecting their difficulty system.
+     */
+    private fun highestGradeForProblems(problems: List<Problem>): String? {
+        if (problems.isEmpty()) return null
+        return problems.maxByOrNull { p -> gradeRank(p.difficulty.system, p.difficulty.grade) }?.difficulty?.grade
+    }
+
+    /**
+     * Produces a comparable numeric rank for grades across supported systems.
+     */
+    private fun gradeRank(system: DifficultySystem, grade: String): Double {
+        return when (system) {
+            DifficultySystem.V_SCALE -> {
+                if (grade == "VB") 0.0 else grade.removePrefix("V").toDoubleOrNull() ?: -1.0
+            }
+            DifficultySystem.FONT -> {
+                val list = DifficultySystem.FONT.getAvailableGrades()
+                val idx = list.indexOf(grade.uppercase())
+                if (idx >= 0) idx.toDouble() else grade.filter { it.isDigit() }.toDoubleOrNull() ?: -1.0
+            }
+            DifficultySystem.YDS -> {
+                // Parse 5.X with optional letter a-d
+                val s = grade.lowercase()
+                if (!s.startsWith("5.")) return -1.0
+                val tail = s.removePrefix("5.")
+                val numberPart = tail.takeWhile { it.isDigit() || it == '.' }
+                val letterPart = tail.drop(numberPart.length).firstOrNull()
+                val base = numberPart.toDoubleOrNull() ?: return -1.0
+                val letterWeight = when (letterPart) {
+                    'a' -> 0.0
+                    'b' -> 0.1
+                    'c' -> 0.2
+                    'd' -> 0.3
+                    else -> 0.0
+                }
+                base + letterWeight
+            }
+            DifficultySystem.CUSTOM -> {
+                grade.filter { it.isDigit() || it == '.' || it == '-' }.toDoubleOrNull() ?: -1.0
+            }
+        }
+    }
 }