Sync bug fixes across the board!

android/README.md

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

android/app/build.gradle.kts

@@ -18,8 +18,8 @@ android {
         applicationId = "com.atridad.ascently"
         minSdk = 31
         targetSdk = 36
-        versionCode = 50
-        versionName = "2.5.0"
+        versionCode = 51
+        versionName = "2.5.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

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

@@ -13,7 +13,6 @@ data class ClimbDataBackup(
     val problems: List<BackupProblem>,
     val sessions: List<BackupClimbSession>,
     val attempts: List<BackupAttempt>,
-    val deletedItems: List<DeletedItem> = emptyList(),
 )
 
 @Serializable
@@ -34,6 +33,7 @@ data class BackupGym(
     @kotlinx.serialization.SerialName("customDifficultyGrades")
     val customDifficultyGrades: List<String>? = null,
     val notes: String? = null,
+    val isDeleted: Boolean = false,
     val createdAt: String,
     val updatedAt: String,
 ) {
@@ -47,10 +47,26 @@ data class BackupGym(
                 difficultySystems = gym.difficultySystems,
                 customDifficultyGrades = gym.customDifficultyGrades.ifEmpty { null },
                 notes = gym.notes,
+                isDeleted = false,
                 createdAt = gym.createdAt,
                 updatedAt = gym.updatedAt,
             )
         }
+
+        fun createTombstone(id: String, deletedAt: String): BackupGym {
+            return BackupGym(
+                id = id,
+                name = "DELETED",
+                location = null,
+                supportedClimbTypes = emptyList(),
+                difficultySystems = emptyList(),
+                customDifficultyGrades = null,
+                notes = null,
+                isDeleted = true,
+                createdAt = deletedAt,
+                updatedAt = deletedAt,
+            )
+        }
     }
 
     fun toGym(): Gym {
@@ -83,6 +99,7 @@ data class BackupProblem(
     val isActive: Boolean = true,
     val dateSet: String? = null,
     val notes: String? = null,
+    val isDeleted: Boolean = false,
     val createdAt: String,
     val updatedAt: String,
 ) {
@@ -106,10 +123,31 @@ data class BackupProblem(
                 isActive = problem.isActive,
                 dateSet = problem.dateSet,
                 notes = problem.notes,
+                isDeleted = false,
                 createdAt = problem.createdAt,
                 updatedAt = problem.updatedAt,
             )
         }
+
+        fun createTombstone(id: String, deletedAt: String): BackupProblem {
+            return BackupProblem(
+                id = id,
+                gymId = "00000000-0000-0000-0000-000000000000",
+                name = "DELETED",
+                description = null,
+                climbType = ClimbType.values().first(),
+                difficulty = DifficultyGrade(DifficultySystem.values().first(), "0"),
+                tags = null,
+                location = null,
+                imagePaths = null,
+                isActive = false,
+                dateSet = null,
+                notes = null,
+                isDeleted = true,
+                createdAt = deletedAt,
+                updatedAt = deletedAt,
+            )
+        }
     }
 
     fun toProblem(): Problem {
@@ -147,6 +185,7 @@ data class BackupClimbSession(
     val duration: Long? = null,
     val status: SessionStatus,
     val notes: String? = null,
+    val isDeleted: Boolean = false,
     val createdAt: String,
     val updatedAt: String,
 ) {
@@ -161,10 +200,27 @@ data class BackupClimbSession(
                 duration = session.duration,
                 status = session.status,
                 notes = session.notes,
+                isDeleted = false,
                 createdAt = session.createdAt,
                 updatedAt = session.updatedAt,
             )
         }
+
+        fun createTombstone(id: String, deletedAt: String): BackupClimbSession {
+            return BackupClimbSession(
+                id = id,
+                gymId = "00000000-0000-0000-0000-000000000000",
+                date = deletedAt,
+                startTime = null,
+                endTime = null,
+                duration = null,
+                status = SessionStatus.values().first(),
+                notes = null,
+                isDeleted = true,
+                createdAt = deletedAt,
+                updatedAt = deletedAt,
+            )
+        }
     }
 
     fun toClimbSession(): ClimbSession {
@@ -195,6 +251,7 @@ data class BackupAttempt(
     val duration: Long? = null,
     val restTime: Long? = null,
     val timestamp: String,
+    val isDeleted: Boolean = false,
     val createdAt: String,
     val updatedAt: String? = null,
 ) {
@@ -210,10 +267,28 @@ data class BackupAttempt(
                 duration = attempt.duration,
                 restTime = attempt.restTime,
                 timestamp = attempt.timestamp,
+                isDeleted = false,
                 createdAt = attempt.createdAt,
                 updatedAt = attempt.updatedAt,
             )
         }
+
+        fun createTombstone(id: String, deletedAt: String): BackupAttempt {
+            return BackupAttempt(
+                id = id,
+                sessionId = "00000000-0000-0000-0000-000000000000",
+                problemId = "00000000-0000-0000-0000-000000000000",
+                result = AttemptResult.values().first(),
+                highestHold = null,
+                notes = null,
+                duration = null,
+                restTime = null,
+                timestamp = deletedAt,
+                isDeleted = true,
+                createdAt = deletedAt,
+                updatedAt = deletedAt,
+            )
+        }
     }
 
     fun toAttempt(): Attempt {

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

@@ -19,6 +19,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.serialization.json.Json
 import java.io.File
+import java.time.Instant
 
 class ClimbRepository(database: AscentlyDatabase, private val context: Context) {
     private val gymDao = database.gymDao()
@@ -38,6 +39,7 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
 
     // Gym operations
     fun getAllGyms(): Flow<List<Gym>> = gymDao.getAllGyms()
+    suspend fun getAllGymsSync(): List<Gym> = gymDao.getAllGyms().first()
     suspend fun getGymById(id: String): Gym? = gymDao.getGymById(id)
     suspend fun insertGym(gym: Gym) {
         gymDao.insertGym(gym)
@@ -60,6 +62,7 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
 
     // Problem operations
     fun getAllProblems(): Flow<List<Problem>> = problemDao.getAllProblems()
+    suspend fun getAllProblemsSync(): List<Problem> = problemDao.getAllProblems().first()
     suspend fun getProblemById(id: String): Problem? = problemDao.getProblemById(id)
     fun getProblemsByGym(gymId: String): Flow<List<Problem>> = problemDao.getProblemsByGym(gymId)
     suspend fun insertProblem(problem: Problem) {
@@ -80,6 +83,7 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
 
     // Session operations
     fun getAllSessions(): Flow<List<ClimbSession>> = sessionDao.getAllSessions()
+    suspend fun getAllSessionsSync(): List<ClimbSession> = sessionDao.getAllSessions().first()
     suspend fun getSessionById(id: String): ClimbSession? = sessionDao.getSessionById(id)
     fun getSessionsByGym(gymId: String): Flow<List<ClimbSession>> =
         sessionDao.getSessionsByGym(gymId)
@@ -122,6 +126,8 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
 
     // Attempt operations
     fun getAllAttempts(): Flow<List<Attempt>> = attemptDao.getAllAttempts()
+    suspend fun getAllAttemptsSync(): List<Attempt> = attemptDao.getAllAttempts().first()
+    suspend fun getAttemptById(id: String): Attempt? = attemptDao.getAttemptById(id)
     fun getAttemptsBySession(sessionId: String): Flow<List<Attempt>> =
         attemptDao.getAttemptsBySession(sessionId)
 
@@ -273,10 +279,9 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
     }
 
     fun trackDeletion(itemId: String, itemType: String) {
-        val currentDeletions = getDeletedItems().toMutableList()
+        cleanupOldDeletions()
         val newDeletion =
             DeletedItem(id = itemId, type = itemType, deletedAt = DateFormatUtils.nowISO8601())
-        currentDeletions.add(newDeletion)
 
         val json = json.encodeToString(newDeletion)
         deletionPreferences.edit { putString("deleted_$itemId", json) }
@@ -304,6 +309,27 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
         deletionPreferences.edit { clear() }
     }
 
+    private fun cleanupOldDeletions() {
+        val allPrefs = deletionPreferences.all
+        val cutoff = Instant.now().minusSeconds(90L * 24 * 60 * 60)
+
+        deletionPreferences.edit {
+            for ((key, value) in allPrefs) {
+                if (key.startsWith("deleted_") && value is String) {
+                    try {
+                        val deletion = json.decodeFromString<DeletedItem>(value)
+                        val deletedAt = Instant.parse(deletion.deletedAt)
+                        if (deletedAt.isBefore(cutoff)) {
+                            remove(key)
+                        }
+                    } catch (_: Exception) {
+                        // Ignore
+                    }
+                }
+            }
+        }
+    }
+
     private fun validateDataIntegrity(
         gyms: List<Gym>,
         problems: List<Problem>,

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

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

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

@@ -18,4 +18,6 @@ sealed class SyncException(message: String) : IOException(message), Serializable
         SyncException("Invalid server response: $details")
 
     data class NetworkError(val details: String) : SyncException("Network error: $details")
+
+    data class General(val details: String) : SyncException(details)
 }

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

@@ -4,6 +4,7 @@ import android.content.Context
 import android.content.SharedPreferences
 import androidx.core.content.edit
 import com.atridad.ascently.data.repository.ClimbRepository
+import com.atridad.ascently.data.state.DataStateManager
 import com.atridad.ascently.utils.AppLogger
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -27,7 +28,7 @@ class SyncService(private val context: Context, private val repository: ClimbRep
     }
 
     // Currently we only support one provider, but this allows for future expansion
-    private val provider: SyncProvider = AscentlySyncProvider(context, repository)
+    private val provider: SyncProvider = AscentlySyncProvider(context, repository, DataStateManager(context))
 
     // State
     private val _isSyncing = MutableStateFlow(false)

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

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

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

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

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

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

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

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

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

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

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

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

android/gradlew.bat

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

branding/.gitignore

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

branding/Balls.icon/icon.json

@@ -0,0 +1,67 @@
+{
+  "fill" : "automatic",
+  "groups" : [
+    {
+      "layers" : [
+        {
+          "image-name" : "AscentlyRedBall.png",
+          "name" : "AscentlyRedBall",
+          "position" : {
+            "scale" : 0.4,
+            "translation-in-points" : [
+              90.60312499999992,
+              127.86484375000009
+            ]
+          }
+        },
+        {
+          "image-name" : "AscentlyYellowBall.png",
+          "name" : "AscentlyYellowBall",
+          "position" : {
+            "scale" : 0.3,
+            "translation-in-points" : [
+              90.50312500000001,
+              -177.66484375
+            ]
+          }
+        },
+        {
+          "image-name" : "AscentlyBlueBall.png",
+          "name" : "AscentlyBlueBall",
+          "position" : {
+            "scale" : 0.3,
+            "translation-in-points" : [
+              -138.20312500000006,
+              177.3648437500001
+            ]
+          }
+        },
+        {
+          "image-name" : "AscentlyGreenBall.png",
+          "name" : "AscentlyGreenBall",
+          "position" : {
+            "scale" : 0.2,
+            "translation-in-points" : [
+              -138.30312499999997,
+              -43.08515625000001
+            ]
+          }
+        }
+      ],
+      "shadow" : {
+        "kind" : "neutral",
+        "opacity" : 0.5
+      },
+      "translucency" : {
+        "enabled" : true,
+        "value" : 0.5
+      }
+    }
+  ],
+  "supported-platforms" : {
+    "circles" : [
+      "watchOS"
+    ],
+    "squares" : "shared"
+  }
+}

branding/Icon.icon/icon.json

@@ -0,0 +1,45 @@
+{
+  "fill" : "automatic",
+  "groups" : [
+    {
+      "layers" : [
+        {
+          "image-name" : "AscetlyTriangle2.png",
+          "name" : "AscetlyTriangle2",
+          "position" : {
+            "scale" : 0.75,
+            "translation-in-points" : [
+              108,
+              -53.8125
+            ]
+          }
+        },
+        {
+          "image-name" : "AscetlyTriangle1.png",
+          "name" : "AscetlyTriangle1",
+          "position" : {
+            "scale" : 0.5,
+            "translation-in-points" : [
+              -215,
+              39.9375
+            ]
+          }
+        }
+      ],
+      "shadow" : {
+        "kind" : "neutral",
+        "opacity" : 0.5
+      },
+      "translucency" : {
+        "enabled" : true,
+        "value" : 0.5
+      }
+    }
+  ],
+  "supported-platforms" : {
+    "circles" : [
+      "watchOS"
+    ],
+    "squares" : "shared"
+  }
+}

branding/generate.py

@@ -1,394 +0,0 @@
-#!/usr/bin/env python3
-
-import xml.etree.ElementTree as ET
-from pathlib import Path
-from typing import Callable, TypedDict
-from PIL import Image, ImageDraw
-
-
-class Polygon(TypedDict):
-    coords: list[tuple[float, float]]
-    fill: str
-
-
-SCRIPT_DIR = Path(__file__).parent
-PROJECT_ROOT = SCRIPT_DIR.parent
-SOURCE_DIR = SCRIPT_DIR / "source"
-LOGOS_DIR = SCRIPT_DIR / "logos"
-
-
-def parse_svg_polygons(svg_path: Path) -> list[Polygon]:
-    tree = ET.parse(svg_path)
-    root = tree.getroot()
-
-    ns = {"svg": "http://www.w3.org/2000/svg"}
-    polygons = root.findall(".//svg:polygon", ns)
-    if not polygons:
-        polygons = root.findall(".//polygon")
-
-    result: list[Polygon] = []
-    for poly in polygons:
-        points_str = poly.get("points", "").strip()
-        fill = poly.get("fill", "#000000")
-
-        coords: list[tuple[float, float]] = []
-        for pair in points_str.split():
-            x, y = pair.split(",")
-            coords.append((float(x), float(y)))
-
-        result.append({"coords": coords, "fill": fill})
-
-    return result
-
-
-def get_bbox(polygons: list[Polygon]) -> dict[str, float]:
-    all_coords: list[tuple[float, float]] = []
-    for poly in polygons:
-        all_coords.extend(poly["coords"])
-
-    xs = [c[0] for c in all_coords]
-    ys = [c[1] for c in all_coords]
-
-    return {
-        "min_x": min(xs),
-        "max_x": max(xs),
-        "min_y": min(ys),
-        "max_y": max(ys),
-        "width": max(xs) - min(xs),
-        "height": max(ys) - min(ys),
-    }
-
-
-def scale_and_center(
-    polygons: list[Polygon], viewbox_size: float, target_width: float
-) -> list[Polygon]:
-    bbox = get_bbox(polygons)
-
-    scale = target_width / bbox["width"]
-    center = viewbox_size / 2
-
-    scaled_polys: list[Polygon] = []
-    for poly in polygons:
-        scaled_coords = [(x * scale, y * scale) for x, y in poly["coords"]]
-        scaled_polys.append({"coords": scaled_coords, "fill": poly["fill"]})
-
-    scaled_bbox = get_bbox(scaled_polys)
-    current_center_x = (scaled_bbox["min_x"] + scaled_bbox["max_x"]) / 2
-    current_center_y = (scaled_bbox["min_y"] + scaled_bbox["max_y"]) / 2
-
-    offset_x = center - current_center_x
-    offset_y = center - current_center_y
-
-    final_polys: list[Polygon] = []
-    for poly in scaled_polys:
-        final_coords = [(x + offset_x, y + offset_y) for x, y in poly["coords"]]
-        final_polys.append({"coords": final_coords, "fill": poly["fill"]})
-
-    return final_polys
-
-
-def format_svg_points(coords: list[tuple[float, float]]) -> str:
-    return " ".join(f"{x:.3f},{y:.3f}" for x, y in coords)
-
-
-def format_android_path(coords: list[tuple[float, float]]) -> str:
-    points = " ".join(f"{x:.3f},{y:.3f}" for x, y in coords)
-    pairs = points.split()
-    return f"M{pairs[0]} L{pairs[1]} L{pairs[2]} Z"
-
-
-def generate_svg(polygons: list[Polygon], width: int, height: int) -> str:
-    lines = [
-        f'<svg width="{width}" height="{height}" viewBox="0 0 {width} {height}" xmlns="http://www.w3.org/2000/svg">'
-    ]
-    for poly in polygons:
-        points = format_svg_points(poly["coords"])
-        lines.append(f'  <polygon points="{points}" fill="{poly["fill"]}"/>')
-    lines.append("</svg>")
-    return "\n".join(lines)
-
-
-def generate_android_vector(
-    polygons: list[Polygon], width: int, height: int, viewbox: int
-) -> str:
-    lines = [
-        '<?xml version="1.0" encoding="utf-8"?>',
-        '<vector xmlns:android="http://schemas.android.com/apk/res/android"',
-        f'    android:width="{width}dp"',
-        f'    android:height="{height}dp"',
-        f'    android:viewportWidth="{viewbox}"',
-        f'    android:viewportHeight="{viewbox}">',
-    ]
-    for poly in polygons:
-        path = format_android_path(poly["coords"])
-        lines.append(
-            f'    <path android:fillColor="{poly["fill"]}" android:pathData="{path}" />'
-        )
-    lines.append("</vector>")
-    return "\n".join(lines)
-
-
-def rasterize_svg(
-    svg_path: Path,
-    output_path: Path,
-    size: int,
-    bg_color: tuple[int, int, int, int] | None = None,
-    circular: bool = False,
-) -> None:
-    from xml.dom import minidom
-
-    doc = minidom.parse(str(svg_path))
-
-    img = Image.new(
-        "RGBA", (size, size), (255, 255, 255, 0) if bg_color is None else bg_color
-    )
-    draw = ImageDraw.Draw(img)
-
-    svg_elem = doc.getElementsByTagName("svg")[0]
-    viewbox = svg_elem.getAttribute("viewBox").split()
-    if viewbox:
-        vb_width = float(viewbox[2])
-        vb_height = float(viewbox[3])
-        scale_x = size / vb_width
-        scale_y = size / vb_height
-    else:
-        scale_x = scale_y = 1
-
-    def parse_transform(
-        transform_str: str,
-    ) -> Callable[[float, float], tuple[float, float]]:
-        import re
-
-        if not transform_str:
-            return lambda x, y: (x, y)
-
-        transforms: list[tuple[str, list[float]]] = []
-        for match in re.finditer(r"(\w+)\(([^)]+)\)", transform_str):
-            func, args_str = match.groups()
-            args = [float(x) for x in args_str.replace(",", " ").split()]
-            transforms.append((func, args))
-
-        def apply_transforms(x: float, y: float) -> tuple[float, float]:
-            for func, args in transforms:
-                if func == "translate":
-                    x += args[0]
-                    y += args[1] if len(args) > 1 else args[0]
-                elif func == "scale":
-                    x *= args[0]
-                    y *= args[1] if len(args) > 1 else args[0]
-            return x, y
-
-        return apply_transforms
-
-    for g in doc.getElementsByTagName("g"):
-        transform = parse_transform(g.getAttribute("transform"))
-
-        for poly in g.getElementsByTagName("polygon"):
-            points_str = poly.getAttribute("points").strip()
-            fill = poly.getAttribute("fill")
-            if not fill:
-                fill = "#000000"
-
-            coords: list[tuple[float, float]] = []
-            for pair in points_str.split():
-                x, y = pair.split(",")
-                x, y = float(x), float(y)
-                x, y = transform(x, y)
-                coords.append((x * scale_x, y * scale_y))
-
-            draw.polygon(coords, fill=fill)
-
-    for poly in doc.getElementsByTagName("polygon"):
-        if poly.parentNode and getattr(poly.parentNode, "tagName", None) == "g":
-            continue
-
-        points_str = poly.getAttribute("points").strip()
-        fill = poly.getAttribute("fill")
-        if not fill:
-            fill = "#000000"
-
-        coords = []
-        for pair in points_str.split():
-            x, y = pair.split(",")
-            coords.append((float(x) * scale_x, float(y) * scale_y))
-
-        draw.polygon(coords, fill=fill)
-
-    if circular:
-        mask = Image.new("L", (size, size), 0)
-        mask_draw = ImageDraw.Draw(mask)
-        mask_draw.ellipse((0, 0, size, size), fill=255)
-        img.putalpha(mask)
-
-    img.save(output_path)
-
-
-def main() -> None:
-    print("Generating branding assets...")
-
-    logo_svg = SOURCE_DIR / "logo.svg"
-    icon_light = SOURCE_DIR / "icon-light.svg"
-    icon_dark = SOURCE_DIR / "icon-dark.svg"
-    icon_tinted = SOURCE_DIR / "icon-tinted.svg"
-
-    polygons = parse_svg_polygons(logo_svg)
-
-    print("  iOS...")
-    ios_assets = PROJECT_ROOT / "ios/Ascently/Assets.xcassets/AppIcon.appiconset"
-
-    for src, dst in [
-        (icon_light, ios_assets / "app_icon_light_template.svg"),
-        (icon_dark, ios_assets / "app_icon_dark_template.svg"),
-        (icon_tinted, ios_assets / "app_icon_tinted_template.svg"),
-    ]:
-        with open(src) as f:
-            content = f.read()
-        with open(dst, "w") as f:
-            f.write(content)
-
-    img_light = Image.new("RGB", (1024, 1024), (255, 255, 255))
-    draw_light = ImageDraw.Draw(img_light)
-    scaled = scale_and_center(polygons, 1024, int(1024 * 0.7))
-    for poly in scaled:
-        coords = [(x, y) for x, y in poly["coords"]]
-        draw_light.polygon(coords, fill=poly["fill"])
-    img_light.save(ios_assets / "app_icon_1024.png")
-
-    img_dark = Image.new("RGB", (1024, 1024), (26, 26, 26))
-    draw_dark = ImageDraw.Draw(img_dark)
-    for poly in scaled:
-        coords = [(x, y) for x, y in poly["coords"]]
-        draw_dark.polygon(coords, fill=poly["fill"])
-    img_dark.save(ios_assets / "app_icon_1024_dark.png")
-
-    img_tinted = Image.new("RGB", (1024, 1024), (0, 0, 0))
-    draw_tinted = ImageDraw.Draw(img_tinted)
-    for i, poly in enumerate(scaled):
-        coords = [(x, y) for x, y in poly["coords"]]
-        draw_tinted.polygon(coords, fill=(0, 0, 0))
-    img_tinted.save(ios_assets / "app_icon_1024_tinted.png")
-
-    print("  Android...")
-
-    polys_108 = scale_and_center(polygons, 108, 60)
-    android_xml = generate_android_vector(polys_108, 108, 108, 108)
-    (
-        PROJECT_ROOT / "android/app/src/main/res/drawable/ic_launcher_foreground.xml"
-    ).write_text(android_xml)
-
-    polys_24 = scale_and_center(polygons, 24, 20)
-    mountains_xml = generate_android_vector(polys_24, 24, 24, 24)
-    (PROJECT_ROOT / "android/app/src/main/res/drawable/ic_mountains.xml").write_text(
-        mountains_xml
-    )
-
-    for density, size in [
-        ("mdpi", 48),
-        ("hdpi", 72),
-        ("xhdpi", 96),
-        ("xxhdpi", 144),
-        ("xxxhdpi", 192),
-    ]:
-        mipmap_dir = PROJECT_ROOT / f"android/app/src/main/res/mipmap-{density}"
-
-        img = Image.new("RGBA", (size, size), (255, 255, 255, 255))
-        draw = ImageDraw.Draw(img)
-
-        scaled = scale_and_center(polygons, size, int(size * 0.6))
-        for poly in scaled:
-            coords = [(x, y) for x, y in poly["coords"]]
-            draw.polygon(coords, fill=poly["fill"])
-
-        img.save(mipmap_dir / "ic_launcher.webp")
-
-        img_round = Image.new("RGBA", (size, size), (255, 255, 255, 255))
-        draw_round = ImageDraw.Draw(img_round)
-
-        for poly in scaled:
-            coords = [(x, y) for x, y in poly["coords"]]
-            draw_round.polygon(coords, fill=poly["fill"])
-
-        mask = Image.new("L", (size, size), 0)
-        mask_draw = ImageDraw.Draw(mask)
-        mask_draw.ellipse((0, 0, size, size), fill=255)
-        img_round.putalpha(mask)
-
-        img_round.save(mipmap_dir / "ic_launcher_round.webp")
-
-    print("  Docs...")
-
-    polys_32 = scale_and_center(polygons, 32, 26)
-    logo_svg_32 = generate_svg(polys_32, 32, 32)
-    (PROJECT_ROOT / "docs/src/assets/logo.svg").write_text(logo_svg_32)
-    (PROJECT_ROOT / "docs/src/assets/logo-dark.svg").write_text(logo_svg_32)
-
-    polys_256 = scale_and_center(polygons, 256, 208)
-    logo_svg_256 = generate_svg(polys_256, 256, 256)
-    (PROJECT_ROOT / "docs/src/assets/logo-highres.svg").write_text(logo_svg_256)
-
-    logo_32_path = PROJECT_ROOT / "docs/src/assets/logo.svg"
-    rasterize_svg(logo_32_path, PROJECT_ROOT / "docs/public/favicon.png", 32)
-
-    sizes = [16, 32, 48]
-    imgs = []
-    for size in sizes:
-        img = Image.new("RGBA", (size, size), (255, 255, 255, 0))
-        draw = ImageDraw.Draw(img)
-
-        scaled = scale_and_center(polygons, size, int(size * 0.8))
-        for poly in scaled:
-            coords = [(x, y) for x, y in poly["coords"]]
-            draw.polygon(coords, fill=poly["fill"])
-
-        imgs.append(img)
-
-    imgs[0].save(
-        PROJECT_ROOT / "docs/public/favicon.ico",
-        format="ICO",
-        sizes=[(s, s) for s in sizes],
-        append_images=imgs[1:],
-    )
-
-    print("  Logos...")
-
-    LOGOS_DIR.mkdir(exist_ok=True)
-
-    sizes = [64, 128, 256, 512, 1024, 2048]
-    for size in sizes:
-        img = Image.new("RGBA", (size, size), (255, 255, 255, 0))
-        draw = ImageDraw.Draw(img)
-
-        scaled = scale_and_center(polygons, size, int(size * 0.8))
-        for poly in scaled:
-            coords = [(x, y) for x, y in poly["coords"]]
-            draw.polygon(coords, fill=poly["fill"])
-
-        img.save(LOGOS_DIR / f"logo-{size}.png")
-
-    for size in sizes:
-        img = Image.new("RGBA", (size, size), (255, 255, 255, 255))
-        draw = ImageDraw.Draw(img)
-
-        scaled = scale_and_center(polygons, size, int(size * 0.8))
-        for poly in scaled:
-            coords = [(x, y) for x, y in poly["coords"]]
-            draw.polygon(coords, fill=poly["fill"])
-
-        img.save(LOGOS_DIR / f"logo-{size}-white.png")
-
-    for size in sizes:
-        img = Image.new("RGBA", (size, size), (26, 26, 26, 255))
-        draw = ImageDraw.Draw(img)
-
-        scaled = scale_and_center(polygons, size, int(size * 0.8))
-        for poly in scaled:
-            coords = [(x, y) for x, y in poly["coords"]]
-            draw.polygon(coords, fill=poly["fill"])
-
-        img.save(LOGOS_DIR / f"logo-{size}-dark.png")
-
-    print("Done.")
-
-
-if __name__ == "__main__":
-    main()

branding/generate.sh

@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-if ! command -v python3 &> /dev/null; then
-    echo "Error: Python 3 required"
-    exit 1
-fi
-
-python3 "$SCRIPT_DIR/generate.py"

branding/source/icon-dark.svg

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="1024" height="1024" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg">
-  <rect width="1024" height="1024" fill="#1A1A1A" rx="180" ry="180"/>
-  <g transform="translate(512, 512) scale(4.75) translate(-54, -42.5)">
-    <polygon points="8,75 35,14.25 62,75" fill="#FFC107"/>
-    <polygon points="31.25,75 65,0.75 98.75,75" fill="#F44336"/>
-  </g>
-</svg>

branding/source/icon-light.svg

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="1024" height="1024" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg">
-  <rect width="1024" height="1024" fill="#FFFFFF" rx="180" ry="180"/>
-  <g transform="translate(512, 512) scale(4.75) translate(-54, -42.5)">
-    <polygon points="8,75 35,14.25 62,75" fill="#FFC107"/>
-    <polygon points="31.25,75 65,0.75 98.75,75" fill="#F44336"/>
-  </g>
-</svg>

branding/source/icon-tinted.svg

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="1024" height="1024" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg">
-  <rect width="1024" height="1024" fill="transparent" rx="180" ry="180"/>
-  <g transform="translate(512, 512) scale(4.75) translate(-54, -42.5)">
-    <polygon points="8,75 35,14.25 62,75" fill="#000000" opacity="0.8"/>
-    <polygon points="31.25,75 65,0.75 98.75,75" fill="#000000" opacity="0.9"/>
-  </g>
-</svg>

branding/source/logo.svg

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="108" height="108" viewBox="0 0 108 108" xmlns="http://www.w3.org/2000/svg">
-  <polygon points="8,75 35,14.25 62,75" fill="#FFC107"/>
-  <polygon points="31.25,75 65,0.75 98.75,75" fill="#F44336"/>
-</svg>

ios/Ascently.xcodeproj/project.pbxproj

@@ -460,12 +460,13 @@
 		D24C19742E75002A0045894C /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = Balls;
+				ASSETCATALOG_COMPILER_APPICON_NAME = Icon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Ascently/Ascently.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 40;
+				CURRENT_PROJECT_VERSION = 44;
 				DEVELOPMENT_TEAM = 4BC9Y2LL4B;
 				DRIVERKIT_DEPLOYMENT_TARGET = 24.6;
 				ENABLE_PREVIEWS = YES;
@@ -474,20 +475,23 @@
 				INFOPLIST_KEY_CFBundleDisplayName = Ascently;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.sports";
 				INFOPLIST_KEY_LSSupportsOpeningDocumentsInPlace = YES;
-				INFOPLIST_KEY_NSCameraUsageDescription = "Ascently needs camera access to take photos of climbing problems.";
-				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "Ascently needs access to your photo library to save and display climbing problem images.";
+				INFOPLIST_KEY_NSAppleMusicUsageDescription = "This app (optionally) needs access to your music library to play your selected playlist during climbing sessions.";
+				INFOPLIST_KEY_NSCameraUsageDescription = "This app needs access to your camera to take photos of climbing problems.";
+				INFOPLIST_KEY_NSHealthShareUsageDescription = "This app needs access to save your climbing workouts to Apple Health.";
+				INFOPLIST_KEY_NSHealthUpdateUsageDescription = "This app needs access to save your climbing workouts to Apple Health.";
+				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "This app needs access to your photo library to add photos to climbing problems.";
+				INFOPLIST_KEY_NSSupportsLiveActivities = YES;
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
-				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				IPHONEOS_DEPLOYMENT_TARGET = 17.6;
+				INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
+				IPHONEOS_DEPLOYMENT_TARGET = 18.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 15.6;
-				MARKETING_VERSION = 2.6.0;
+				MARKETING_VERSION = 2.6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.atridad.Ascently;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -498,7 +502,7 @@
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
 				SWIFT_VERSION = 6.0;
-				TARGETED_DEVICE_FAMILY = 1;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				TVOS_DEPLOYMENT_TARGET = 18.6;
 				WATCHOS_DEPLOYMENT_TARGET = 11.6;
 				XROS_DEPLOYMENT_TARGET = 2.6;
@@ -508,12 +512,13 @@
 		D24C19752E75002A0045894C /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = Balls;
+				ASSETCATALOG_COMPILER_APPICON_NAME = Icon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Ascently/Ascently.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 40;
+				CURRENT_PROJECT_VERSION = 44;
 				DEVELOPMENT_TEAM = 4BC9Y2LL4B;
 				DRIVERKIT_DEPLOYMENT_TARGET = 24.6;
 				ENABLE_PREVIEWS = YES;
@@ -522,20 +527,23 @@
 				INFOPLIST_KEY_CFBundleDisplayName = Ascently;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.sports";
 				INFOPLIST_KEY_LSSupportsOpeningDocumentsInPlace = YES;
-				INFOPLIST_KEY_NSCameraUsageDescription = "Ascently needs camera access to take photos of climbing problems.";
-				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "Ascently needs access to your photo library to save and display climbing problem images.";
+				INFOPLIST_KEY_NSAppleMusicUsageDescription = "This app (optionally) needs access to your music library to play your selected playlist during climbing sessions.";
+				INFOPLIST_KEY_NSCameraUsageDescription = "This app needs access to your camera to take photos of climbing problems.";
+				INFOPLIST_KEY_NSHealthShareUsageDescription = "This app needs access to save your climbing workouts to Apple Health.";
+				INFOPLIST_KEY_NSHealthUpdateUsageDescription = "This app needs access to save your climbing workouts to Apple Health.";
+				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "This app needs access to your photo library to add photos to climbing problems.";
+				INFOPLIST_KEY_NSSupportsLiveActivities = YES;
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
-				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				IPHONEOS_DEPLOYMENT_TARGET = 17.6;
+				INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
+				IPHONEOS_DEPLOYMENT_TARGET = 18.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 15.6;
-				MARKETING_VERSION = 2.6.0;
+				MARKETING_VERSION = 2.6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.atridad.Ascently;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -546,7 +554,7 @@
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
 				SWIFT_VERSION = 6.0;
-				TARGETED_DEVICE_FAMILY = 1;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				TVOS_DEPLOYMENT_TARGET = 18.6;
 				WATCHOS_DEPLOYMENT_TARGET = 11.6;
 				XROS_DEPLOYMENT_TARGET = 2.6;
@@ -562,7 +570,7 @@
 				DEVELOPMENT_TEAM = 4BC9Y2LL4B;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.atri.dad.OpenClimb.Watch.AscentlyTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.atridad.Ascently.AscentlyTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				STRING_CATALOG_GENERATE_SYMBOLS = NO;
 				SWIFT_APPROACHABLE_CONCURRENCY = YES;
@@ -583,7 +591,7 @@
 				DEVELOPMENT_TEAM = 4BC9Y2LL4B;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.atri.dad.OpenClimb.Watch.AscentlyTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.atridad.Ascently.AscentlyTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				STRING_CATALOG_GENERATE_SYMBOLS = NO;
 				SWIFT_APPROACHABLE_CONCURRENCY = YES;
@@ -602,18 +610,19 @@
 				ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
 				CODE_SIGN_ENTITLEMENTS = SessionStatusLiveExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 40;
+				CURRENT_PROJECT_VERSION = 44;
 				DEVELOPMENT_TEAM = 4BC9Y2LL4B;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = SessionStatusLive/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = SessionStatusLive;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
+				IPHONEOS_DEPLOYMENT_TARGET = 18.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.6.0;
+				MARKETING_VERSION = 2.6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.atridad.Ascently.SessionStatusLive;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -632,18 +641,19 @@
 				ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
 				CODE_SIGN_ENTITLEMENTS = SessionStatusLiveExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 40;
+				CURRENT_PROJECT_VERSION = 44;
 				DEVELOPMENT_TEAM = 4BC9Y2LL4B;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = SessionStatusLive/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = SessionStatusLive;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
+				IPHONEOS_DEPLOYMENT_TARGET = 18.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.6.0;
+				MARKETING_VERSION = 2.6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.atridad.Ascently.SessionStatusLive;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;

ios/Ascently/AppIntents/SessionIntentSupport.swift

@@ -41,7 +41,7 @@ final class SessionIntentController {
     func startSessionWithLastUsedGym() async throws -> SessionIntentSummary {
         // Wait for data to load
         if dataManager.gyms.isEmpty {
-            try? await Task.sleep(nanoseconds: 500_000_000)
+            try? await Task.sleep(for: .milliseconds(500))
         }
 
         guard let lastGym = dataManager.getLastUsedGym() else {
@@ -49,7 +49,7 @@ final class SessionIntentController {
             throw SessionIntentError.noRecentGym
         }
 
-        guard let startedSession = await dataManager.startSessionAsync(gymId: lastGym.id) else {
+        guard let startedSession = await dataManager.startSession(gymId: lastGym.id) else {
             logFailure(.failedToStartSession, context: "Data manager failed to create new session")
             throw SessionIntentError.failedToStartSession
         }
@@ -68,7 +68,7 @@ final class SessionIntentController {
             throw SessionIntentError.noActiveSession
         }
 
-        guard let completedSession = await dataManager.endSessionAsync(activeSession.id) else {
+        guard let completedSession = await dataManager.endSession(activeSession.id) else {
             logFailure(
                 .failedToEndSession, context: "Data manager failed to complete active session")
             throw SessionIntentError.failedToEndSession
@@ -97,7 +97,7 @@ final class SessionIntentController {
     func toggleSession() async throws -> (summary: SessionIntentSummary, wasStarted: Bool) {
         // Wait for data to load
         if dataManager.gyms.isEmpty {
-            try? await Task.sleep(nanoseconds: 500_000_000)
+            try? await Task.sleep(for: .milliseconds(500))
         }
 
         if dataManager.activeSession != nil {

ios/Ascently/AppIntents/ToggleSessionIntent.swift

@@ -20,14 +20,14 @@ struct ToggleSessionIntent: AppIntent {
 
     func perform() async throws -> some IntentResult & ProvidesDialog {
         // Wait for app initialization
-        try? await Task.sleep(nanoseconds: 1_000_000_000)
+        try? await Task.sleep(for: .seconds(1))
 
         let controller = await SessionIntentController()
         let (summary, wasStarted) = try await controller.toggleSession()
 
         if wasStarted {
             // Wait for Live Activity
-            try? await Task.sleep(nanoseconds: 500_000_000)
+            try? await Task.sleep(for: .milliseconds(500))
             return .result(dialog: IntentDialog("Session started at \(summary.gymName). Have an awesome climb!"))
         } else {
             return .result(dialog: IntentDialog("Session at \(summary.gymName) ended. Nice work!"))

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

@@ -1,38 +0,0 @@
-{
-  "images": [
-    {
-      "filename": "app_icon_1024.png",
-      "idiom": "universal",
-      "platform": "ios",
-      "size": "1024x1024"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "dark"
-        }
-      ],
-      "filename": "app_icon_1024_dark.png",
-      "idiom": "universal",
-      "platform": "ios",
-      "size": "1024x1024"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "tinted"
-        }
-      ],
-      "filename": "app_icon_1024_tinted.png",
-      "idiom": "universal",
-      "platform": "ios",
-      "size": "1024x1024"
-    }
-  ],
-  "info": {
-    "author": "xcode",
-    "version": 1
-  }
-}

ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_dark_template.svg

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="1024" height="1024" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg">
-  <rect width="1024" height="1024" fill="#1A1A1A" rx="180" ry="180"/>
-  <g transform="translate(512, 512) scale(4.75) translate(-54, -42.5)">
-    <polygon points="8,75 35,14.25 62,75" fill="#FFC107"/>
-    <polygon points="31.25,75 65,0.75 98.75,75" fill="#F44336"/>
-  </g>
-</svg>

ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_light_template.svg

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="1024" height="1024" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg">
-  <rect width="1024" height="1024" fill="#FFFFFF" rx="180" ry="180"/>
-  <g transform="translate(512, 512) scale(4.75) translate(-54, -42.5)">
-    <polygon points="8,75 35,14.25 62,75" fill="#FFC107"/>
-    <polygon points="31.25,75 65,0.75 98.75,75" fill="#F44336"/>
-  </g>
-</svg>

ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_tinted_template.svg

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="1024" height="1024" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg">
-  <rect width="1024" height="1024" fill="transparent" rx="180" ry="180"/>
-  <g transform="translate(512, 512) scale(4.75) translate(-54, -42.5)">
-    <polygon points="8,75 35,14.25 62,75" fill="#000000" opacity="0.8"/>
-    <polygon points="31.25,75 65,0.75 98.75,75" fill="#000000" opacity="0.9"/>
-  </g>
-</svg>

ios/Ascently/Assets.xcassets/AppLogo.imageset/Contents.json

@@ -1,56 +0,0 @@
-{
-  "images": [
-    {
-      "filename": "app_logo_256.png",
-      "idiom": "universal",
-      "scale": "1x"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "dark"
-        }
-      ],
-      "filename": "app_logo_256_dark.png",
-      "idiom": "universal",
-      "scale": "1x"
-    },
-    {
-      "filename": "app_logo_256.png",
-      "idiom": "universal",
-      "scale": "2x"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "dark"
-        }
-      ],
-      "filename": "app_logo_256_dark.png",
-      "idiom": "universal",
-      "scale": "2x"
-    },
-    {
-      "filename": "app_logo_256.png",
-      "idiom": "universal",
-      "scale": "3x"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "dark"
-        }
-      ],
-      "filename": "app_logo_256_dark.png",
-      "idiom": "universal",
-      "scale": "3x"
-    }
-  ],
-  "info": {
-    "author": "xcode",
-    "version": 1
-  }
-}

ios/Ascently/Balls.icon/icon.json

@@ -0,0 +1,67 @@
+{
+  "fill" : "automatic",
+  "groups" : [
+    {
+      "layers" : [
+        {
+          "image-name" : "AscentlyRedBall.png",
+          "name" : "AscentlyRedBall",
+          "position" : {
+            "scale" : 0.4,
+            "translation-in-points" : [
+              90.60312499999992,
+              127.86484375000009
+            ]
+          }
+        },
+        {
+          "image-name" : "AscentlyYellowBall.png",
+          "name" : "AscentlyYellowBall",
+          "position" : {
+            "scale" : 0.3,
+            "translation-in-points" : [
+              90.50312500000001,
+              -177.66484375
+            ]
+          }
+        },
+        {
+          "image-name" : "AscentlyBlueBall.png",
+          "name" : "AscentlyBlueBall",
+          "position" : {
+            "scale" : 0.3,
+            "translation-in-points" : [
+              -138.20312500000006,
+              177.3648437500001
+            ]
+          }
+        },
+        {
+          "image-name" : "AscentlyGreenBall.png",
+          "name" : "AscentlyGreenBall",
+          "position" : {
+            "scale" : 0.2,
+            "translation-in-points" : [
+              -138.30312499999997,
+              -43.08515625000001
+            ]
+          }
+        }
+      ],
+      "shadow" : {
+        "kind" : "neutral",
+        "opacity" : 0.5
+      },
+      "translucency" : {
+        "enabled" : true,
+        "value" : 0.5
+      }
+    }
+  ],
+  "supported-platforms" : {
+    "circles" : [
+      "watchOS"
+    ],
+    "squares" : "shared"
+  }
+}