diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..25d0ef4 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,18 @@ +root = true + +[*] +indent_style = space +indent_size = 4 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[*.md] +trim_trailing_whitespace = false + +[*.{json,yml,yaml}] +indent_size = 2 + +[Makefile] +indent_style = tab diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..8d74285 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,77 @@ +# Auto detect text files and perform LF normalization +* text=auto + +# Source code files +*.swift text eol=lf +*.kt text eol=lf +*.kts text eol=lf +*.java text eol=lf +*.go text eol=lf +*.py text eol=lf +*.ts text eol=lf +*.tsx text eol=lf +*.js text eol=lf +*.jsx text eol=lf +*.mjs text eol=lf +*.cjs text eol=lf + +# Configuration files +*.json text eol=lf +*.yml text eol=lf +*.yaml text eol=lf +*.toml text eol=lf +*.xml text eol=lf +*.plist text eol=lf +*.properties text eol=lf +*.gradle text eol=lf +*.md text eol=lf + +# Shell scripts +*.sh text eol=lf +*.bash text eol=lf +*.zsh text eol=lf + +# Windows batch files +*.bat text eol=crlf +*.cmd text eol=crlf + +# Binary files +*.png binary +*.jpg binary +*.jpeg binary +*.gif binary +*.ico binary +*.webp binary +*.pdf binary +*.zip binary +*.tar binary +*.gz binary +*.jar binary +*.aar binary +*.apk binary +*.ipa binary +*.xcassets binary +*.ttf binary +*.otf binary +*.woff binary +*.woff2 binary +*.eot binary + +# Xcode files +*.pbxproj merge=union +*.xcworkspacedata text eol=lf +*.xcscheme text eol=lf + +# Gradle wrapper +gradlew text eol=lf +gradlew.bat text eol=crlf +gradle-wrapper.jar binary + +# Lock files +*.lock text -diff +package-lock.json text -diff +pnpm-lock.yaml text -diff + +# Documentation +LICENSE text eol=lf +README.md text eol=lf diff --git a/.gitignore b/.gitignore index 8a08472..9fa4fe1 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,11 @@ local.properties # Log/OS Files *.log .DS_Store +.DS_Store? +._* +.Spotlight-V100 +.Trashes +Thumbs.db # Android Studio generated files and folders captures/ @@ -34,3 +39,44 @@ google-services.json # Android Profiling *.hprof + +# iOS/Xcode +ios/build/ +ios/DerivedData/ +ios/*.xcuserstate +ios/**/xcuserdata/ +ios/**/*.xcuserstate +*.xccheckout +*.moved-aside +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 +*.hmap +*.ipa +*.dSYM.zip +*.dSYM +timeline.xctimeline +playground.xcworkspace + +# CocoaPods +ios/Pods/ +ios/Podfile.lock + +# Swift Package Manager +ios/.swiftpm/ +ios/Package.resolved +.build/ + +# fastlane +fastlane/report.xml +fastlane/Preview.html +fastlane/screenshots/**/*.png +fastlane/test_output + +# Code Injection +iOSInjectionProject/ diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..8028ceb --- /dev/null +++ b/Makefile @@ -0,0 +1,90 @@ +# Ascently Makefile + +.PHONY: help android-lint android-format android-build android-test \ + ios-lint ios-format ios-build ios-test clean + +# Default target +help: + @echo "Ascently Dev Commands" + @echo "==============================" + @echo "" + @echo "Android:" + @echo " make android-lint: Run Detekt static analysis" + @echo " make android-format: Check code formatting with Spotless" + @echo " make android-format-fix: Auto-fix code formatting" + @echo " make android-build: Build debug APK" + @echo " make android-release: Build release APK" + @echo " make android-test: Run unit tests" + @echo "" + @echo "iOS:" + @echo " make ios-lint: Run SwiftLint" + @echo " make ios-lint-fix: Run SwiftLint with auto-fix" + @echo " make ios-format: Run SwiftFormat (dry-run)" + @echo " make ios-format-fix: Run SwiftFormat with auto-fix" + @echo " make ios-build: Build iOS app" + @echo "" + @echo "General:" + @echo " make lint: Run linters for both platforms" + @echo " make format: Check formatting for both platforms" + @echo " make clean: Clean build artifacts" + +# Android commands +android-lint: + cd android && ./gradlew detekt + +android-format: + cd android && ./gradlew spotlessCheck + +android-format-fix: + cd android && ./gradlew spotlessApply + +android-build: + cd android && ./gradlew assembleDebug + +android-release: + cd android && ./gradlew assembleRelease + +android-test: + cd android && ./gradlew test + +# iOS commands (requires SwiftLint and SwiftFormat!!!) +ios-lint: + @if command -v swiftlint >/dev/null 2>&1; then \ + cd ios && swiftlint; \ + else \ + echo "SwiftLint not installed. Install with: brew install swiftlint"; \ + fi + +ios-lint-fix: + @if command -v swiftlint >/dev/null 2>&1; then \ + cd ios && swiftlint --fix; \ + else \ + echo "SwiftLint not installed. Install with: brew install swiftlint"; \ + fi + +ios-format: + @if command -v swiftformat >/dev/null 2>&1; then \ + cd ios && swiftformat . --lint; \ + else \ + echo "SwiftFormat not installed. Install with: brew install swiftformat"; \ + fi + +ios-format-fix: + @if command -v swiftformat >/dev/null 2>&1; then \ + cd ios && swiftformat .; \ + else \ + echo "SwiftFormat not installed. Install with: brew install swiftformat"; \ + fi + +ios-build: + cd ios && xcodebuild -project Ascently.xcodeproj -scheme Ascently -configuration Debug build + +# Combined commands +lint: android-lint ios-lint + +format: android-format ios-format + +# Clean +clean: + cd android && ./gradlew clean + rm -rf ios/build ios/DerivedData diff --git a/android/.editorconfig b/android/.editorconfig new file mode 100644 index 0000000..8de4168 --- /dev/null +++ b/android/.editorconfig @@ -0,0 +1,31 @@ +root = true + +[*] +indent_style = space +indent_size = 4 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[*.{kt,kts}] +indent_size = 4 +max_line_length = 220 +ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL +ktlint_standard_no-wildcard-imports = disabled +ktlint_standard_package-name = disabled + +[*.{xml,gradle}] +indent_size = 4 + +[*.md] +trim_trailing_whitespace = false + +[*.properties] +indent_size = 2 + +[*.toml] +indent_size = 4 + +[Makefile] +indent_style = tab diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 862303b..a8109de 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -6,6 +6,8 @@ plugins { alias(libs.plugins.kotlin.compose) alias(libs.plugins.kotlin.serialization) alias(libs.plugins.ksp) + alias(libs.plugins.detekt) + alias(libs.plugins.spotless) } android { @@ -16,8 +18,8 @@ android { applicationId = "com.atridad.ascently" minSdk = 31 targetSdk = 36 - versionCode = 48 - versionName = "2.4.0" + versionCode = 49 + versionName = "2.4.1" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } @@ -26,8 +28,8 @@ android { release { isMinifyEnabled = true proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro", ) } } @@ -83,7 +85,7 @@ dependencies { implementation(libs.coil.compose) // Health Connect - implementation("androidx.health.connect:connect-client:1.1.0-alpha07") + implementation(libs.health.connect) // Testing testImplementation(libs.junit) @@ -99,6 +101,51 @@ dependencies { androidTestImplementation(libs.androidx.ui.test.junit4) debugImplementation(libs.androidx.ui.tooling) debugImplementation(libs.androidx.ui.test.manifest) - debugImplementation(libs.androidx.ui.tooling) - debugImplementation(libs.androidx.ui.test.manifest) +} + +// Detekt configuration +detekt { + config.setFrom(files("$rootDir/detekt.yml")) + buildUponDefaultConfig = true + allRules = false + parallel = true +} + +// Spotless configuration for code formatting +spotless { + kotlin { + target("**/*.kt") + targetExclude("**/build/**/*.kt") + ktlint("1.2.1") + .editorConfigOverride( + mapOf( + "ktlint_standard_no-wildcard-imports" to "disabled", + "ktlint_standard_package-name" to "disabled", + "ktlint_standard_function-naming" to "disabled", + "ktlint_standard_filename" to "disabled", + "ktlint_standard_value-parameter-comment" to "disabled", + "ktlint_standard_comment-wrapping" to "disabled", + "ktlint_standard_multiline-expression-wrapping" to "disabled", + "ktlint_standard_string-template-indent" to "disabled", + "ktlint_standard_property-naming" to "disabled", + "ktlint_standard_class-naming" to "disabled", + "ktlint_standard_backing-property-naming" to "disabled", + "ktlint_standard_function-signature" to "disabled", + "ktlint_standard_parameter-list-wrapping" to "disabled", + "ktlint_standard_max-line-length" to "disabled", + "max_line_length" to "off", + ), + ) + } + kotlinGradle { + target("**/*.kts") + targetExclude("**/build/**/*.kts") + ktlint("1.2.1") + .editorConfigOverride( + mapOf( + "ktlint_standard_no-wildcard-imports" to "disabled", + "max_line_length" to "off", + ), + ) + } } diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro index 481bb43..679f3b2 100644 --- a/android/app/proguard-rules.pro +++ b/android/app/proguard-rules.pro @@ -5,17 +5,69 @@ # For more details, see # http://developer.android.com/guide/developing/tools/proguard.html +# Preserve line number information for debugging stack traces +-keepattributes SourceFile,LineNumberTable + +# Hide the original source file name +-renamesourcefileattribute SourceFile + +# Keep generic signatures for Kotlin +-keepattributes Signature + +# Keep annotations +-keepattributes *Annotation* + +# Room Database +-keep class * extends androidx.room.RoomDatabase +-keep @androidx.room.Entity class * +-keepclassmembers class * { + @androidx.room.* ; + @androidx.room.* ; +} + +# Kotlinx Serialization +-keepattributes *Annotation*, InnerClasses +-dontnote kotlinx.serialization.AnnotationsKt + +-keepclassmembers class kotlinx.serialization.json.** { + *** Companion; +} +-keepclasseswithmembers class kotlinx.serialization.json.** { + kotlinx.serialization.KSerializer serializer(...); +} + +-keep,includedescriptorclasses class com.atridad.ascently.**$$serializer { *; } +-keepclassmembers class com.atridad.ascently.** { + *** Companion; +} +-keepclasseswithmembers class com.atridad.ascently.** { + kotlinx.serialization.KSerializer serializer(...); +} + +# Keep data classes used for serialization +-keep class com.atridad.ascently.data.model.** { *; } +-keep class com.atridad.ascently.data.format.** { *; } + +# Coroutines +-keepnames class kotlinx.coroutines.internal.MainDispatcherFactory {} +-keepnames class kotlinx.coroutines.CoroutineExceptionHandler {} +-keepclassmembers class kotlinx.coroutines.** { + volatile ; +} + +# Health Connect +-keep class androidx.health.connect.client.** { *; } +-keep interface androidx.health.connect.client.** { *; } + +# Coil Image Loading +-keep class coil.** { *; } + +# Keep Compose +-keep class androidx.compose.** { *; } + # If your project uses WebView with JS, uncomment the following # and specify the fully qualified class name to the JavaScript interface # class: #-keepclassmembers class fqcn.of.javascript.interface.for.webview { # public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file +#} \ No newline at end of file diff --git a/android/app/src/main/java/com/atridad/ascently/MainActivity.kt b/android/app/src/main/java/com/atridad/ascently/MainActivity.kt index 7f66490..3fc7930 100644 --- a/android/app/src/main/java/com/atridad/ascently/MainActivity.kt +++ b/android/app/src/main/java/com/atridad/ascently/MainActivity.kt @@ -37,9 +37,9 @@ class MainActivity : ComponentActivity() { AscentlyTheme { Surface(modifier = Modifier.fillMaxSize()) { AscentlyApp( - shortcutAction = shortcutAction, - lastUsedGymId = lastUsedGymId, - onShortcutActionProcessed = { clearShortcutAction() } + shortcutAction = shortcutAction, + lastUsedGymId = lastUsedGymId, + onShortcutActionProcessed = { clearShortcutAction() }, ) } } diff --git a/android/app/src/main/java/com/atridad/ascently/data/database/Converters.kt b/android/app/src/main/java/com/atridad/ascently/data/database/Converters.kt index 8bcd29e..0aefcca 100644 --- a/android/app/src/main/java/com/atridad/ascently/data/database/Converters.kt +++ b/android/app/src/main/java/com/atridad/ascently/data/database/Converters.kt @@ -6,75 +6,74 @@ import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json class Converters { - + @TypeConverter fun fromClimbTypeList(value: List): String { return Json.encodeToString(value) } - + @TypeConverter fun toClimbTypeList(value: String): List { return Json.decodeFromString(value) } - + @TypeConverter fun fromDifficultySystemList(value: List): String { return Json.encodeToString(value) } - + @TypeConverter fun toDifficultySystemList(value: String): List { return Json.decodeFromString(value) } - + @TypeConverter fun fromStringList(value: List): String { return Json.encodeToString(value) } - + @TypeConverter fun toStringList(value: String): List { return Json.decodeFromString(value) } - + @TypeConverter fun fromDifficultyGrade(value: DifficultyGrade): String { return Json.encodeToString(value) } - + @TypeConverter fun toDifficultyGrade(value: String): DifficultyGrade { return Json.decodeFromString(value) } - + @TypeConverter fun fromClimbType(value: ClimbType): String { return value.name } - + @TypeConverter fun toClimbType(value: String): ClimbType { return ClimbType.valueOf(value) } - + @TypeConverter fun fromAttemptResult(value: AttemptResult): String { return value.name } - + @TypeConverter fun toAttemptResult(value: String): AttemptResult { return AttemptResult.valueOf(value) } - + @TypeConverter fun fromSessionStatus(value: SessionStatus): String { return value.name } - + @TypeConverter fun toSessionStatus(value: String): SessionStatus { return SessionStatus.valueOf(value) } - } diff --git a/android/app/src/main/java/com/atridad/ascently/data/database/OpenClimbDatabase.kt b/android/app/src/main/java/com/atridad/ascently/data/database/OpenClimbDatabase.kt index abd30ac..e2fe4e5 100644 --- a/android/app/src/main/java/com/atridad/ascently/data/database/OpenClimbDatabase.kt +++ b/android/app/src/main/java/com/atridad/ascently/data/database/OpenClimbDatabase.kt @@ -11,9 +11,9 @@ import com.atridad.ascently.data.database.dao.* import com.atridad.ascently.data.model.* @Database( - entities = [Gym::class, Problem::class, ClimbSession::class, Attempt::class], - version = 6, - exportSchema = false + entities = [Gym::class, Problem::class, ClimbSession::class, Attempt::class], + version = 6, + exportSchema = false, ) @TypeConverters(Converters::class) abstract class AscentlyDatabase : RoomDatabase() { @@ -27,79 +27,79 @@ abstract class AscentlyDatabase : RoomDatabase() { @Volatile private var INSTANCE: AscentlyDatabase? = null val MIGRATION_4_5 = - object : Migration(4, 5) { - override fun migrate(db: SupportSQLiteDatabase) { - val cursor = db.query("PRAGMA table_info(climb_sessions)") - val existingColumns = mutableSetOf() + object : Migration(4, 5) { + override fun migrate(db: SupportSQLiteDatabase) { + val cursor = db.query("PRAGMA table_info(climb_sessions)") + val existingColumns = mutableSetOf() - while (cursor.moveToNext()) { - val columnName = cursor.getString(cursor.getColumnIndexOrThrow("name")) - existingColumns.add(columnName) - } - cursor.close() - - if (!existingColumns.contains("startTime")) { - db.execSQL("ALTER TABLE climb_sessions ADD COLUMN startTime TEXT") - } - if (!existingColumns.contains("endTime")) { - db.execSQL("ALTER TABLE climb_sessions ADD COLUMN endTime TEXT") - } - if (!existingColumns.contains("status")) { - db.execSQL( - "ALTER TABLE climb_sessions ADD COLUMN status TEXT NOT NULL DEFAULT 'COMPLETED'" - ) - } + while (cursor.moveToNext()) { + val columnName = cursor.getString(cursor.getColumnIndexOrThrow("name")) + existingColumns.add(columnName) + } + cursor.close() + if (!existingColumns.contains("startTime")) { + db.execSQL("ALTER TABLE climb_sessions ADD COLUMN startTime TEXT") + } + if (!existingColumns.contains("endTime")) { + db.execSQL("ALTER TABLE climb_sessions ADD COLUMN endTime TEXT") + } + if (!existingColumns.contains("status")) { db.execSQL( - "UPDATE climb_sessions SET startTime = createdAt WHERE startTime IS NULL" - ) - db.execSQL( - "UPDATE climb_sessions SET status = 'COMPLETED' WHERE status IS NULL OR status = ''" + "ALTER TABLE climb_sessions ADD COLUMN status TEXT NOT NULL DEFAULT 'COMPLETED'", ) } + + db.execSQL( + "UPDATE climb_sessions SET startTime = createdAt WHERE startTime IS NULL", + ) + db.execSQL( + "UPDATE climb_sessions SET status = 'COMPLETED' WHERE status IS NULL OR status = ''", + ) } + } val MIGRATION_5_6 = - object : Migration(5, 6) { - override fun migrate(db: SupportSQLiteDatabase) { - // Add updatedAt column to attempts table - val cursor = db.query("PRAGMA table_info(attempts)") - val existingColumns = mutableSetOf() + object : Migration(5, 6) { + override fun migrate(db: SupportSQLiteDatabase) { + // Add updatedAt column to attempts table + val cursor = db.query("PRAGMA table_info(attempts)") + val existingColumns = mutableSetOf() - while (cursor.moveToNext()) { - val columnName = cursor.getString(cursor.getColumnIndexOrThrow("name")) - existingColumns.add(columnName) - } - cursor.close() + while (cursor.moveToNext()) { + val columnName = cursor.getString(cursor.getColumnIndexOrThrow("name")) + existingColumns.add(columnName) + } + cursor.close() - if (!existingColumns.contains("updatedAt")) { - db.execSQL( - "ALTER TABLE attempts ADD COLUMN updatedAt TEXT NOT NULL DEFAULT ''" - ) - // Set updatedAt to createdAt for existing records - db.execSQL( - "UPDATE attempts SET updatedAt = createdAt WHERE updatedAt = ''" - ) - } + if (!existingColumns.contains("updatedAt")) { + db.execSQL( + "ALTER TABLE attempts ADD COLUMN updatedAt TEXT NOT NULL DEFAULT ''", + ) + // Set updatedAt to createdAt for existing records + db.execSQL( + "UPDATE attempts SET updatedAt = createdAt WHERE updatedAt = ''", + ) } } + } fun getDatabase(context: Context): AscentlyDatabase { return INSTANCE - ?: synchronized(this) { - val instance = - Room.databaseBuilder( - context.applicationContext, - AscentlyDatabase::class.java, - "ascently_database" - ) - .addMigrations(MIGRATION_4_5, MIGRATION_5_6) - .enableMultiInstanceInvalidation() - .fallbackToDestructiveMigration(false) - .build() - INSTANCE = instance - instance - } + ?: synchronized(this) { + val instance = + Room.databaseBuilder( + context.applicationContext, + AscentlyDatabase::class.java, + "ascently_database", + ) + .addMigrations(MIGRATION_4_5, MIGRATION_5_6) + .enableMultiInstanceInvalidation() + .fallbackToDestructiveMigration(false) + .build() + INSTANCE = instance + instance + } } } } diff --git a/android/app/src/main/java/com/atridad/ascently/data/database/dao/AttemptDao.kt b/android/app/src/main/java/com/atridad/ascently/data/database/dao/AttemptDao.kt index 4d86b68..092b35f 100644 --- a/android/app/src/main/java/com/atridad/ascently/data/database/dao/AttemptDao.kt +++ b/android/app/src/main/java/com/atridad/ascently/data/database/dao/AttemptDao.kt @@ -7,70 +7,70 @@ import kotlinx.coroutines.flow.Flow @Dao interface AttemptDao { - + @Query("SELECT * FROM attempts ORDER BY timestamp DESC") fun getAllAttempts(): Flow> - + @Query("SELECT * FROM attempts WHERE id = :id") suspend fun getAttemptById(id: String): Attempt? - + @Query("SELECT * FROM attempts WHERE sessionId = :sessionId ORDER BY timestamp ASC") fun getAttemptsBySession(sessionId: String): Flow> - + @Query("SELECT * FROM attempts WHERE problemId = :problemId ORDER BY timestamp DESC") fun getAttemptsByProblem(problemId: String): Flow> - + @Query("SELECT * FROM attempts WHERE sessionId = :sessionId AND problemId = :problemId ORDER BY timestamp ASC") fun getAttemptsBySessionAndProblem(sessionId: String, problemId: String): Flow> - + @Query("SELECT * FROM attempts WHERE result = :result ORDER BY timestamp DESC") fun getAttemptsByResult(result: AttemptResult): Flow> - + @Query("SELECT * FROM attempts WHERE timestamp BETWEEN :startDate AND :endDate ORDER BY timestamp DESC") fun getAttemptsInDateRange(startDate: String, endDate: String): Flow> - + @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun insertAttempt(attempt: Attempt) - + @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun insertAttempts(attempts: List) - + @Update suspend fun updateAttempt(attempt: Attempt) - + @Delete suspend fun deleteAttempt(attempt: Attempt) - + @Query("DELETE FROM attempts WHERE id = :id") suspend fun deleteAttemptById(id: String) - + @Query("DELETE FROM attempts WHERE sessionId = :sessionId") suspend fun deleteAttemptsBySession(sessionId: String) - + @Query("DELETE FROM attempts WHERE problemId = :problemId") suspend fun deleteAttemptsByProblem(problemId: String) - + @Query("SELECT COUNT(*) FROM attempts") suspend fun getAttemptsCount(): Int - + @Query("DELETE FROM attempts") suspend fun deleteAllAttempts() - + @Query("SELECT COUNT(*) FROM attempts WHERE sessionId = :sessionId") suspend fun getAttemptsCountBySession(sessionId: String): Int - + @Query("SELECT COUNT(*) FROM attempts WHERE problemId = :problemId") suspend fun getAttemptsCountByProblem(problemId: String): Int - + @Query("SELECT COUNT(*) FROM attempts WHERE result = :result") suspend fun getAttemptsCountByResult(result: AttemptResult): Int - + @Query("SELECT COUNT(*) FROM attempts WHERE problemId = :problemId AND result IN ('SUCCESS', 'FLASH', 'REDPOINT', 'ONSIGHT')") suspend fun getSuccessfulAttemptsCountByProblem(problemId: String): Int - + @Query("SELECT * FROM attempts WHERE problemId = :problemId AND result IN ('SUCCESS', 'FLASH', 'REDPOINT', 'ONSIGHT') ORDER BY timestamp ASC LIMIT 1") suspend fun getFirstSuccessfulAttempt(problemId: String): Attempt? - + @Query("SELECT * FROM attempts WHERE problemId = :problemId ORDER BY timestamp DESC LIMIT 1") suspend fun getLatestAttemptForProblem(problemId: String): Attempt? } diff --git a/android/app/src/main/java/com/atridad/ascently/data/database/dao/ClimbSessionDao.kt b/android/app/src/main/java/com/atridad/ascently/data/database/dao/ClimbSessionDao.kt index 452b3c9..3b902f2 100644 --- a/android/app/src/main/java/com/atridad/ascently/data/database/dao/ClimbSessionDao.kt +++ b/android/app/src/main/java/com/atridad/ascently/data/database/dao/ClimbSessionDao.kt @@ -7,61 +7,61 @@ import kotlinx.coroutines.flow.Flow @Dao interface ClimbSessionDao { - + @Query("SELECT * FROM climb_sessions ORDER BY date DESC") fun getAllSessions(): Flow> - + @Query("SELECT * FROM climb_sessions WHERE id = :id") suspend fun getSessionById(id: String): ClimbSession? - + @Query("SELECT * FROM climb_sessions WHERE gymId = :gymId ORDER BY date DESC") fun getSessionsByGym(gymId: String): Flow> - + @Query("SELECT * FROM climb_sessions WHERE date = :date ORDER BY createdAt DESC") fun getSessionsByDate(date: String): Flow> - + @Query("SELECT * FROM climb_sessions WHERE date BETWEEN :startDate AND :endDate ORDER BY date DESC") fun getSessionsInDateRange(startDate: String, endDate: String): Flow> - + @Query("SELECT * FROM climb_sessions ORDER BY date DESC LIMIT :limit") fun getRecentSessions(limit: Int = 10): Flow> - + @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun insertSession(session: ClimbSession) - + @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun insertSessions(sessions: List) - + @Update suspend fun updateSession(session: ClimbSession) - + @Delete suspend fun deleteSession(session: ClimbSession) - + @Query("DELETE FROM climb_sessions WHERE id = :id") suspend fun deleteSessionById(id: String) - + @Query("SELECT COUNT(*) FROM climb_sessions") suspend fun getSessionsCount(): Int - + @Query("SELECT COUNT(*) FROM climb_sessions WHERE gymId = :gymId") suspend fun getSessionsCountByGym(gymId: String): Int - + @Query("SELECT COUNT(*) FROM climb_sessions WHERE date BETWEEN :startDate AND :endDate") suspend fun getSessionsCountInDateRange(startDate: String, endDate: String): Int - + @Query("SELECT DISTINCT date FROM climb_sessions ORDER BY date DESC") suspend fun getUniqueDates(): List - + @Query("SELECT * FROM climb_sessions WHERE status = :status ORDER BY date DESC") fun getSessionsByStatus(status: SessionStatus): Flow> - + @Query("SELECT * FROM climb_sessions WHERE status = 'ACTIVE' ORDER BY date DESC LIMIT 1") suspend fun getActiveSession(): ClimbSession? - + @Query("DELETE FROM climb_sessions") suspend fun deleteAllSessions() - + @Query("SELECT * FROM climb_sessions WHERE status = 'ACTIVE' ORDER BY date DESC LIMIT 1") fun getActiveSessionFlow(): Flow } diff --git a/android/app/src/main/java/com/atridad/ascently/data/database/dao/GymDao.kt b/android/app/src/main/java/com/atridad/ascently/data/database/dao/GymDao.kt index 045ee54..dc533bd 100644 --- a/android/app/src/main/java/com/atridad/ascently/data/database/dao/GymDao.kt +++ b/android/app/src/main/java/com/atridad/ascently/data/database/dao/GymDao.kt @@ -7,37 +7,37 @@ import kotlinx.coroutines.flow.Flow @Dao interface GymDao { - + @Query("SELECT * FROM gyms ORDER BY name ASC") fun getAllGyms(): Flow> - + @Query("SELECT * FROM gyms WHERE id = :id") suspend fun getGymById(id: String): Gym? - + @Query("SELECT * FROM gyms WHERE :climbType IN (supportedClimbTypes)") fun getGymsByClimbType(climbType: ClimbType): Flow> - + @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun insertGym(gym: Gym) - + @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun insertGyms(gyms: List) - + @Update suspend fun updateGym(gym: Gym) - + @Delete suspend fun deleteGym(gym: Gym) - + @Query("DELETE FROM gyms WHERE id = :id") suspend fun deleteGymById(id: String) - + @Query("SELECT COUNT(*) FROM gyms") suspend fun getGymsCount(): Int - + @Query("SELECT * FROM gyms WHERE name LIKE '%' || :searchQuery || '%' OR location LIKE '%' || :searchQuery || '%'") fun searchGyms(searchQuery: String): Flow> - + @Query("DELETE FROM gyms") suspend fun deleteAllGyms() } diff --git a/android/app/src/main/java/com/atridad/ascently/data/database/dao/ProblemDao.kt b/android/app/src/main/java/com/atridad/ascently/data/database/dao/ProblemDao.kt index 5529e11..b82fc9b 100644 --- a/android/app/src/main/java/com/atridad/ascently/data/database/dao/ProblemDao.kt +++ b/android/app/src/main/java/com/atridad/ascently/data/database/dao/ProblemDao.kt @@ -11,7 +11,8 @@ interface ProblemDao { @Query("SELECT * FROM problems ORDER BY updatedAt DESC") fun getAllProblems(): Flow> - @Query("SELECT * FROM problems WHERE id = :id") suspend fun getProblemById(id: String): Problem? + @Query("SELECT * FROM problems WHERE id = :id") + suspend fun getProblemById(id: String): Problem? @Query("SELECT * FROM problems WHERE gymId = :gymId ORDER BY updatedAt DESC") fun getProblemsByGym(gymId: String): Flow> @@ -20,7 +21,7 @@ interface ProblemDao { fun getProblemsByClimbType(climbType: ClimbType): Flow> @Query( - "SELECT * FROM problems WHERE gymId = :gymId AND climbType = :climbType ORDER BY updatedAt DESC" + "SELECT * FROM problems WHERE gymId = :gymId AND climbType = :climbType ORDER BY updatedAt DESC", ) fun getProblemsByGymAndType(gymId: String, climbType: ClimbType): Flow> @@ -30,7 +31,8 @@ interface ProblemDao { @Query("SELECT * FROM problems WHERE gymId = :gymId AND isActive = 1 ORDER BY updatedAt DESC") fun getActiveProblemsByGym(gymId: String): Flow> - @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun insertProblem(problem: Problem) + @Insert(onConflict = OnConflictStrategy.REPLACE) + suspend fun insertProblem(problem: Problem) @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun insertProblems(problems: List) @@ -39,7 +41,8 @@ interface ProblemDao { @Delete suspend fun deleteProblem(problem: Problem) - @Query("DELETE FROM problems WHERE id = :id") suspend fun deleteProblemById(id: String) + @Query("DELETE FROM problems WHERE id = :id") + suspend fun deleteProblemById(id: String) @Query("SELECT COUNT(*) FROM problems WHERE gymId = :gymId") suspend fun getProblemsCountByGym(gymId: String): Int @@ -48,17 +51,19 @@ interface ProblemDao { suspend fun getActiveProblemsCount(): Int @Query( - """ + """ SELECT * FROM problems WHERE (name LIKE '%' || :searchQuery || '%' OR description LIKE '%' || :searchQuery || '%' OR location LIKE '%' || :searchQuery || '%') ORDER BY updatedAt DESC - """ + """, ) fun searchProblems(searchQuery: String): Flow> - @Query("SELECT COUNT(*) FROM problems") suspend fun getProblemsCount(): Int + @Query("SELECT COUNT(*) FROM problems") + suspend fun getProblemsCount(): Int - @Query("DELETE FROM problems") suspend fun deleteAllProblems() + @Query("DELETE FROM problems") + suspend fun deleteAllProblems() } diff --git a/android/app/src/main/java/com/atridad/ascently/data/format/BackupFormat.kt b/android/app/src/main/java/com/atridad/ascently/data/format/BackupFormat.kt index ce3513d..988d1cc 100644 --- a/android/app/src/main/java/com/atridad/ascently/data/format/BackupFormat.kt +++ b/android/app/src/main/java/com/atridad/ascently/data/format/BackupFormat.kt @@ -6,64 +6,64 @@ import kotlinx.serialization.Serializable // Root structure for Ascently backup data @Serializable data class ClimbDataBackup( - val exportedAt: String, - val version: String = "2.0", - val formatVersion: String = "2.0", - val gyms: List, - val problems: List, - val sessions: List, - val attempts: List, - val deletedItems: List = emptyList() + val exportedAt: String, + val version: String = "2.0", + val formatVersion: String = "2.0", + val gyms: List, + val problems: List, + val sessions: List, + val attempts: List, + val deletedItems: List = emptyList(), ) @Serializable data class DeletedItem( - val id: String, - val type: String, // "gym", "problem", "session", "attempt" - val deletedAt: String + val id: String, + val type: String, // "gym", "problem", "session", "attempt" + val deletedAt: String, ) // Platform-neutral gym representation for backup/restore @Serializable data class BackupGym( - val id: String, - val name: String, - val location: String? = null, - val supportedClimbTypes: List, - val difficultySystems: List, - @kotlinx.serialization.SerialName("customDifficultyGrades") - val customDifficultyGrades: List? = null, - val notes: String? = null, - val createdAt: String, - val updatedAt: String + val id: String, + val name: String, + val location: String? = null, + val supportedClimbTypes: List, + val difficultySystems: List, + @kotlinx.serialization.SerialName("customDifficultyGrades") + val customDifficultyGrades: List? = null, + val notes: String? = null, + val createdAt: String, + val updatedAt: String, ) { companion object { fun fromGym(gym: Gym): BackupGym { return BackupGym( - id = gym.id, - name = gym.name, - location = gym.location, - supportedClimbTypes = gym.supportedClimbTypes, - difficultySystems = gym.difficultySystems, - customDifficultyGrades = gym.customDifficultyGrades.ifEmpty { null }, - notes = gym.notes, - createdAt = gym.createdAt, - updatedAt = gym.updatedAt + id = gym.id, + name = gym.name, + location = gym.location, + supportedClimbTypes = gym.supportedClimbTypes, + difficultySystems = gym.difficultySystems, + customDifficultyGrades = gym.customDifficultyGrades.ifEmpty { null }, + notes = gym.notes, + createdAt = gym.createdAt, + updatedAt = gym.updatedAt, ) } } fun toGym(): Gym { return Gym( - id = id, - name = name, - location = location, - supportedClimbTypes = supportedClimbTypes, - difficultySystems = difficultySystems, - customDifficultyGrades = customDifficultyGrades ?: emptyList(), - notes = notes, - createdAt = createdAt, - updatedAt = updatedAt + id = id, + name = name, + location = location, + supportedClimbTypes = supportedClimbTypes, + difficultySystems = difficultySystems, + customDifficultyGrades = customDifficultyGrades ?: emptyList(), + notes = notes, + createdAt = createdAt, + updatedAt = updatedAt, ) } } @@ -71,60 +71,63 @@ data class BackupGym( // Platform-neutral problem representation for backup/restore @Serializable data class BackupProblem( - val id: String, - val gymId: String, - val name: String? = null, - val description: String? = null, - val climbType: ClimbType, - val difficulty: DifficultyGrade, - val tags: List? = null, - val location: String? = null, - val imagePaths: List? = null, - val isActive: Boolean = true, - val dateSet: String? = null, - val notes: String? = null, - val createdAt: String, - val updatedAt: String + val id: String, + val gymId: String, + val name: String? = null, + val description: String? = null, + val climbType: ClimbType, + val difficulty: DifficultyGrade, + val tags: List? = null, + val location: String? = null, + val imagePaths: List? = null, + val isActive: Boolean = true, + val dateSet: String? = null, + val notes: String? = null, + val createdAt: String, + val updatedAt: String, ) { companion object { fun fromProblem(problem: Problem): BackupProblem { return BackupProblem( - id = problem.id, - gymId = problem.gymId, - name = problem.name, - description = problem.description, - climbType = problem.climbType, - difficulty = problem.difficulty, - tags = problem.tags, - location = problem.location, - imagePaths = - if (problem.imagePaths.isEmpty()) null - else problem.imagePaths.map { path -> path.substringAfterLast('/') }, - isActive = problem.isActive, - dateSet = problem.dateSet, - notes = problem.notes, - createdAt = problem.createdAt, - updatedAt = problem.updatedAt + id = problem.id, + gymId = problem.gymId, + name = problem.name, + description = problem.description, + climbType = problem.climbType, + difficulty = problem.difficulty, + tags = problem.tags, + location = problem.location, + imagePaths = + if (problem.imagePaths.isEmpty()) { + null + } else { + problem.imagePaths.map { path -> path.substringAfterLast('/') } + }, + isActive = problem.isActive, + dateSet = problem.dateSet, + notes = problem.notes, + createdAt = problem.createdAt, + updatedAt = problem.updatedAt, ) } } fun toProblem(): Problem { return Problem( - id = id, - gymId = gymId, - name = name, - description = description, - climbType = climbType, - difficulty = difficulty, - tags = tags ?: emptyList(), - location = location, - imagePaths = imagePaths ?: emptyList(), - isActive = isActive, - dateSet = dateSet, - notes = notes, - createdAt = createdAt, - updatedAt = updatedAt + id = id, + gymId = gymId, + name = name, + description = description, + climbType = climbType, + difficulty = difficulty, + tags = tags ?: emptyList(), + location = location, + imagePaths = imagePaths ?: emptyList(), + isActive = isActive, + dateSet = dateSet, + notes = notes, + createdAt = createdAt, + updatedAt = updatedAt, ) } @@ -136,46 +139,46 @@ data class BackupProblem( // Platform-neutral climb session representation for backup/restore @Serializable data class BackupClimbSession( - val id: String, - val gymId: String, - val date: String, - val startTime: String? = null, - val endTime: String? = null, - val duration: Long? = null, - val status: SessionStatus, - val notes: String? = null, - val createdAt: String, - val updatedAt: String + val id: String, + val gymId: String, + val date: String, + val startTime: String? = null, + val endTime: String? = null, + val duration: Long? = null, + val status: SessionStatus, + val notes: String? = null, + val createdAt: String, + val updatedAt: String, ) { companion object { fun fromClimbSession(session: ClimbSession): BackupClimbSession { return BackupClimbSession( - id = session.id, - gymId = session.gymId, - date = session.date, - startTime = session.startTime, - endTime = session.endTime, - duration = session.duration, - status = session.status, - notes = session.notes, - createdAt = session.createdAt, - updatedAt = session.updatedAt + id = session.id, + gymId = session.gymId, + date = session.date, + startTime = session.startTime, + endTime = session.endTime, + duration = session.duration, + status = session.status, + notes = session.notes, + createdAt = session.createdAt, + updatedAt = session.updatedAt, ) } } fun toClimbSession(): ClimbSession { return ClimbSession( - id = id, - gymId = gymId, - date = date, - startTime = startTime, - endTime = endTime, - duration = duration, - status = status, - notes = notes, - createdAt = createdAt, - updatedAt = updatedAt + id = id, + gymId = gymId, + date = date, + startTime = startTime, + endTime = endTime, + duration = duration, + status = status, + notes = notes, + createdAt = createdAt, + updatedAt = updatedAt, ) } } @@ -183,49 +186,49 @@ data class BackupClimbSession( // Platform-neutral attempt representation for backup/restore @Serializable data class BackupAttempt( - val id: String, - val sessionId: String, - val problemId: String, - val result: AttemptResult, - val highestHold: String? = null, - val notes: String? = null, - val duration: Long? = null, - val restTime: Long? = null, - val timestamp: String, - val createdAt: String, - val updatedAt: String? = null + val id: String, + val sessionId: String, + val problemId: String, + val result: AttemptResult, + val highestHold: String? = null, + val notes: String? = null, + val duration: Long? = null, + val restTime: Long? = null, + val timestamp: String, + val createdAt: String, + val updatedAt: String? = null, ) { companion object { fun fromAttempt(attempt: Attempt): BackupAttempt { return BackupAttempt( - id = attempt.id, - sessionId = attempt.sessionId, - problemId = attempt.problemId, - result = attempt.result, - highestHold = attempt.highestHold, - notes = attempt.notes, - duration = attempt.duration, - restTime = attempt.restTime, - timestamp = attempt.timestamp, - createdAt = attempt.createdAt, - updatedAt = attempt.updatedAt + id = attempt.id, + sessionId = attempt.sessionId, + problemId = attempt.problemId, + result = attempt.result, + highestHold = attempt.highestHold, + notes = attempt.notes, + duration = attempt.duration, + restTime = attempt.restTime, + timestamp = attempt.timestamp, + createdAt = attempt.createdAt, + updatedAt = attempt.updatedAt, ) } } fun toAttempt(): Attempt { return Attempt( - id = id, - sessionId = sessionId, - problemId = problemId, - result = result, - highestHold = highestHold, - notes = notes, - duration = duration, - restTime = restTime, - timestamp = timestamp, - createdAt = createdAt, - updatedAt = updatedAt ?: createdAt + id = id, + sessionId = sessionId, + problemId = problemId, + result = result, + highestHold = highestHold, + notes = notes, + duration = duration, + restTime = restTime, + timestamp = timestamp, + createdAt = createdAt, + updatedAt = updatedAt ?: createdAt, ) } } diff --git a/android/app/src/main/java/com/atridad/ascently/data/health/HealthConnectStub.kt b/android/app/src/main/java/com/atridad/ascently/data/health/HealthConnectStub.kt index c6e54b5..cc88aec 100644 --- a/android/app/src/main/java/com/atridad/ascently/data/health/HealthConnectStub.kt +++ b/android/app/src/main/java/com/atridad/ascently/data/health/HealthConnectStub.kt @@ -3,7 +3,6 @@ package com.atridad.ascently.data.health import android.annotation.SuppressLint import android.content.Context import android.content.SharedPreferences -import com.atridad.ascently.utils.AppLogger import androidx.activity.result.contract.ActivityResultContract import androidx.health.connect.client.HealthConnectClient import androidx.health.connect.client.PermissionController @@ -14,14 +13,15 @@ import androidx.health.connect.client.records.TotalCaloriesBurnedRecord import androidx.health.connect.client.units.Energy import com.atridad.ascently.data.model.ClimbSession import com.atridad.ascently.data.model.SessionStatus +import com.atridad.ascently.utils.AppLogger import com.atridad.ascently.utils.DateFormatUtils -import java.time.Duration -import java.time.Instant -import java.time.ZoneOffset import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.flow +import java.time.Duration +import java.time.Instant +import java.time.ZoneOffset /** * Health Connect manager for Ascently that syncs climbing sessions to Samsung Health, Google Fit, @@ -52,7 +52,7 @@ class HealthConnectManager(private val context: Context) { HealthPermission.getReadPermission(HeartRateRecord::class), HealthPermission.getWritePermission(HeartRateRecord::class), HealthPermission.getReadPermission(TotalCaloriesBurnedRecord::class), - HealthPermission.getWritePermission(TotalCaloriesBurnedRecord::class) + HealthPermission.getWritePermission(TotalCaloriesBurnedRecord::class), ) } @@ -127,8 +127,9 @@ class HealthConnectManager(private val context: Context) { suspend fun isReady(): Boolean { return try { - if (!_isEnabled.value || !_isCompatible.value || healthConnectClient == null) + if (!_isEnabled.value || !_isCompatible.value || healthConnectClient == null) { return false + } val isAvailable = HealthConnectClient.getSdkStatus(context) == HealthConnectClient.SDK_AVAILABLE @@ -157,18 +158,18 @@ class HealthConnectManager(private val context: Context) { suspend fun syncCompletedSession( session: ClimbSession, gymName: String, - attemptCount: Int = 0 + attemptCount: Int = 0, ): Result { return try { if (!isReady() || !_autoSync.value) { return Result.failure( - IllegalStateException("Health Connect not ready or auto-sync disabled") + IllegalStateException("Health Connect not ready or auto-sync disabled"), ) } if (session.status != SessionStatus.COMPLETED) { return Result.failure( - IllegalArgumentException("Only completed sessions can be synced") + IllegalArgumentException("Only completed sessions can be synced"), ) } @@ -177,7 +178,7 @@ class HealthConnectManager(private val context: Context) { if (startTime == null || endTime == null) { return Result.failure( - IllegalArgumentException("Session must have valid start and end times") + IllegalArgumentException("Session must have valid start and end times"), ) } @@ -190,12 +191,12 @@ class HealthConnectManager(private val context: Context) { ExerciseSessionRecord( startTime = startTime, startZoneOffset = - ZoneOffset.systemDefault().rules.getOffset(startTime), + ZoneOffset.systemDefault().rules.getOffset(startTime), endTime = endTime, endZoneOffset = ZoneOffset.systemDefault().rules.getOffset(endTime), exerciseType = - ExerciseSessionRecord.EXERCISE_TYPE_STRENGTH_TRAINING, - title = "Rock Climbing at $gymName" + ExerciseSessionRecord.EXERCISE_TYPE_STRENGTH_TRAINING, + title = "Rock Climbing at $gymName", ) records.add(exerciseSession) } catch (e: Exception) { @@ -211,11 +212,11 @@ class HealthConnectManager(private val context: Context) { TotalCaloriesBurnedRecord( startTime = startTime, startZoneOffset = - ZoneOffset.systemDefault().rules.getOffset(startTime), + ZoneOffset.systemDefault().rules.getOffset(startTime), endTime = endTime, endZoneOffset = - ZoneOffset.systemDefault().rules.getOffset(endTime), - energy = Energy.calories(estimatedCalories) + ZoneOffset.systemDefault().rules.getOffset(endTime), + energy = Energy.calories(estimatedCalories), ) records.add(caloriesRecord) } @@ -262,7 +263,7 @@ class HealthConnectManager(private val context: Context) { suspend fun autoSyncCompletedSession( session: ClimbSession, gymName: String, - attemptCount: Int = 0 + attemptCount: Int = 0, ): Result { return if (_autoSync.value && isReady() && session.status == SessionStatus.COMPLETED) { AppLogger.d(TAG) { "Auto-syncing completed session '${session.id}' to Health Connect..." } @@ -295,7 +296,7 @@ class HealthConnectManager(private val context: Context) { private fun createHeartRateRecord( startTime: Instant, endTime: Instant, - attemptCount: Int + attemptCount: Int, ): HeartRateRecord? { return try { val samples = mutableListOf() @@ -324,7 +325,7 @@ class HealthConnectManager(private val context: Context) { startZoneOffset = ZoneOffset.systemDefault().rules.getOffset(startTime), endTime = endTime, endZoneOffset = ZoneOffset.systemDefault().rules.getOffset(endTime), - samples = samples + samples = samples, ) } catch (e: Exception) { AppLogger.e(TAG, e) { "Error creating heart rate record" } diff --git a/android/app/src/main/java/com/atridad/ascently/data/model/Attempt.kt b/android/app/src/main/java/com/atridad/ascently/data/model/Attempt.kt index 4eb6174..e00de87 100644 --- a/android/app/src/main/java/com/atridad/ascently/data/model/Attempt.kt +++ b/android/app/src/main/java/com/atridad/ascently/data/model/Attempt.kt @@ -12,65 +12,66 @@ enum class AttemptResult { SUCCESS, FALL, NO_PROGRESS, - FLASH + FLASH, } @Entity( - tableName = "attempts", - foreignKeys = - [ - ForeignKey( - entity = ClimbSession::class, - parentColumns = ["id"], - childColumns = ["sessionId"], - onDelete = ForeignKey.CASCADE - ), - ForeignKey( - entity = Problem::class, - parentColumns = ["id"], - childColumns = ["problemId"], - onDelete = ForeignKey.CASCADE - )], - indices = [Index(value = ["sessionId"]), Index(value = ["problemId"])] + tableName = "attempts", + foreignKeys = + [ + ForeignKey( + entity = ClimbSession::class, + parentColumns = ["id"], + childColumns = ["sessionId"], + onDelete = ForeignKey.CASCADE, + ), + ForeignKey( + entity = Problem::class, + parentColumns = ["id"], + childColumns = ["problemId"], + onDelete = ForeignKey.CASCADE, + ), + ], + indices = [Index(value = ["sessionId"]), Index(value = ["problemId"])], ) @Serializable data class Attempt( - @PrimaryKey val id: String, - val sessionId: String, - val problemId: String, - val result: AttemptResult, - val highestHold: String? = null, - val notes: String? = null, - val duration: Long? = null, - val restTime: Long? = null, - val timestamp: String, - val createdAt: String, - val updatedAt: String + @PrimaryKey val id: String, + val sessionId: String, + val problemId: String, + val result: AttemptResult, + val highestHold: String? = null, + val notes: String? = null, + val duration: Long? = null, + val restTime: Long? = null, + val timestamp: String, + val createdAt: String, + val updatedAt: String, ) { companion object { fun create( - sessionId: String, - problemId: String, - result: AttemptResult, - highestHold: String? = null, - notes: String? = null, - duration: Long? = null, - restTime: Long? = null, - timestamp: String = DateFormatUtils.nowISO8601() + sessionId: String, + problemId: String, + result: AttemptResult, + highestHold: String? = null, + notes: String? = null, + duration: Long? = null, + restTime: Long? = null, + timestamp: String = DateFormatUtils.nowISO8601(), ): Attempt { val now = DateFormatUtils.nowISO8601() return Attempt( - id = java.util.UUID.randomUUID().toString(), - sessionId = sessionId, - problemId = problemId, - result = result, - highestHold = highestHold, - notes = notes, - duration = duration, - restTime = restTime, - timestamp = timestamp, - createdAt = now, - updatedAt = now + id = java.util.UUID.randomUUID().toString(), + sessionId = sessionId, + problemId = problemId, + result = result, + highestHold = highestHold, + notes = notes, + duration = duration, + restTime = restTime, + timestamp = timestamp, + createdAt = now, + updatedAt = now, ) } } diff --git a/android/app/src/main/java/com/atridad/ascently/data/model/ClimbSession.kt b/android/app/src/main/java/com/atridad/ascently/data/model/ClimbSession.kt index af1e026..cb830b4 100644 --- a/android/app/src/main/java/com/atridad/ascently/data/model/ClimbSession.kt +++ b/android/app/src/main/java/com/atridad/ascently/data/model/ClimbSession.kt @@ -11,69 +11,74 @@ import kotlinx.serialization.Serializable enum class SessionStatus { ACTIVE, COMPLETED, - PAUSED + PAUSED, } @Entity( - tableName = "climb_sessions", - foreignKeys = - [ - ForeignKey( - entity = Gym::class, - parentColumns = ["id"], - childColumns = ["gymId"], - onDelete = ForeignKey.CASCADE - )], - indices = [Index(value = ["gymId"])] + tableName = "climb_sessions", + foreignKeys = + [ + ForeignKey( + entity = Gym::class, + parentColumns = ["id"], + childColumns = ["gymId"], + onDelete = ForeignKey.CASCADE, + ), + ], + indices = [Index(value = ["gymId"])], ) @Serializable data class ClimbSession( - @PrimaryKey val id: String, - val gymId: String, - val date: String, - val startTime: String? = null, - val endTime: String? = null, - val duration: Long? = null, - val status: SessionStatus = SessionStatus.ACTIVE, - val notes: String? = null, - val createdAt: String, - val updatedAt: String + @PrimaryKey val id: String, + val gymId: String, + val date: String, + val startTime: String? = null, + val endTime: String? = null, + val duration: Long? = null, + val status: SessionStatus = SessionStatus.ACTIVE, + val notes: String? = null, + val createdAt: String, + val updatedAt: String, ) { companion object { fun create(gymId: String, notes: String? = null): ClimbSession { val now = DateFormatUtils.nowISO8601() return ClimbSession( - id = java.util.UUID.randomUUID().toString(), - gymId = gymId, - date = now, - startTime = now, - status = SessionStatus.ACTIVE, - notes = notes, - createdAt = now, - updatedAt = now + id = java.util.UUID.randomUUID().toString(), + gymId = gymId, + date = now, + startTime = now, + status = SessionStatus.ACTIVE, + notes = notes, + createdAt = now, + updatedAt = now, ) } fun ClimbSession.complete(): ClimbSession { val endTime = DateFormatUtils.nowISO8601() val durationMinutes = - if (startTime != null) { - try { - val start = DateFormatUtils.parseISO8601(startTime) - val end = DateFormatUtils.parseISO8601(endTime) - if (start != null && end != null) { - java.time.Duration.between(start, end).toMinutes() - } else null - } catch (_: Exception) { + if (startTime != null) { + try { + val start = DateFormatUtils.parseISO8601(startTime) + val end = DateFormatUtils.parseISO8601(endTime) + if (start != null && end != null) { + java.time.Duration.between(start, end).toMinutes() + } else { null } - } else null + } catch (_: Exception) { + null + } + } else { + null + } return this.copy( - endTime = endTime, - duration = durationMinutes, - status = SessionStatus.COMPLETED, - updatedAt = DateFormatUtils.nowISO8601() + endTime = endTime, + duration = durationMinutes, + status = SessionStatus.COMPLETED, + updatedAt = DateFormatUtils.nowISO8601(), ) } } diff --git a/android/app/src/main/java/com/atridad/ascently/data/model/ClimbType.kt b/android/app/src/main/java/com/atridad/ascently/data/model/ClimbType.kt index 4fd258c..254d04e 100644 --- a/android/app/src/main/java/com/atridad/ascently/data/model/ClimbType.kt +++ b/android/app/src/main/java/com/atridad/ascently/data/model/ClimbType.kt @@ -5,12 +5,13 @@ import kotlinx.serialization.Serializable @Serializable enum class ClimbType { ROPE, - BOULDER; + BOULDER, + ; val displayName: String get() = - when (this) { - ROPE -> "Rope" - BOULDER -> "Bouldering" - } + when (this) { + ROPE -> "Rope" + BOULDER -> "Bouldering" + } } diff --git a/android/app/src/main/java/com/atridad/ascently/data/model/DifficultySystem.kt b/android/app/src/main/java/com/atridad/ascently/data/model/DifficultySystem.kt index 2cb1732..5d212af 100644 --- a/android/app/src/main/java/com/atridad/ascently/data/model/DifficultySystem.kt +++ b/android/app/src/main/java/com/atridad/ascently/data/model/DifficultySystem.kt @@ -10,132 +10,133 @@ enum class DifficultySystem { // Rope YDS, - CUSTOM; + CUSTOM, + ; val displayName: String get() = - when (this) { - V_SCALE -> "V Scale" - FONT -> "Font Scale" - YDS -> "YDS (Yosemite)" - CUSTOM -> "Custom" - } + when (this) { + V_SCALE -> "V Scale" + FONT -> "Font Scale" + YDS -> "YDS (Yosemite)" + CUSTOM -> "Custom" + } val isBoulderingSystem: Boolean get() = - when (this) { - V_SCALE, FONT -> true - YDS -> false - CUSTOM -> true - } + when (this) { + V_SCALE, FONT -> true + YDS -> false + CUSTOM -> true + } val isRopeSystem: Boolean get() = - when (this) { - YDS -> true - V_SCALE, FONT -> false - CUSTOM -> true - } + when (this) { + YDS -> true + V_SCALE, FONT -> false + CUSTOM -> true + } val availableGrades: List get() = - when (this) { - V_SCALE -> - listOf( - "VB", - "V0", - "V1", - "V2", - "V3", - "V4", - "V5", - "V6", - "V7", - "V8", - "V9", - "V10", - "V11", - "V12", - "V13", - "V14", - "V15", - "V16", - "V17" - ) - FONT -> - listOf( - "3", - "4A", - "4B", - "4C", - "5A", - "5B", - "5C", - "6A", - "6A+", - "6B", - "6B+", - "6C", - "6C+", - "7A", - "7A+", - "7B", - "7B+", - "7C", - "7C+", - "8A", - "8A+", - "8B", - "8B+", - "8C", - "8C+" - ) - YDS -> - listOf( - "5.0", - "5.1", - "5.2", - "5.3", - "5.4", - "5.5", - "5.6", - "5.7", - "5.8", - "5.9", - "5.10a", - "5.10b", - "5.10c", - "5.10d", - "5.11a", - "5.11b", - "5.11c", - "5.11d", - "5.12a", - "5.12b", - "5.12c", - "5.12d", - "5.13a", - "5.13b", - "5.13c", - "5.13d", - "5.14a", - "5.14b", - "5.14c", - "5.14d", - "5.15a", - "5.15b", - "5.15c", - "5.15d" - ) - CUSTOM -> emptyList() - } + when (this) { + V_SCALE -> + listOf( + "VB", + "V0", + "V1", + "V2", + "V3", + "V4", + "V5", + "V6", + "V7", + "V8", + "V9", + "V10", + "V11", + "V12", + "V13", + "V14", + "V15", + "V16", + "V17", + ) + FONT -> + listOf( + "3", + "4A", + "4B", + "4C", + "5A", + "5B", + "5C", + "6A", + "6A+", + "6B", + "6B+", + "6C", + "6C+", + "7A", + "7A+", + "7B", + "7B+", + "7C", + "7C+", + "8A", + "8A+", + "8B", + "8B+", + "8C", + "8C+", + ) + YDS -> + listOf( + "5.0", + "5.1", + "5.2", + "5.3", + "5.4", + "5.5", + "5.6", + "5.7", + "5.8", + "5.9", + "5.10a", + "5.10b", + "5.10c", + "5.10d", + "5.11a", + "5.11b", + "5.11c", + "5.11d", + "5.12a", + "5.12b", + "5.12c", + "5.12d", + "5.13a", + "5.13b", + "5.13c", + "5.13d", + "5.14a", + "5.14b", + "5.14c", + "5.14d", + "5.15a", + "5.15b", + "5.15c", + "5.15d", + ) + CUSTOM -> emptyList() + } companion object { fun systemsForClimbType(climbType: ClimbType): List = - when (climbType) { - ClimbType.BOULDER -> entries.filter { it.isBoulderingSystem } - ClimbType.ROPE -> entries.filter { it.isRopeSystem } - } + when (climbType) { + ClimbType.BOULDER -> entries.filter { it.isBoulderingSystem } + ClimbType.ROPE -> entries.filter { it.isRopeSystem } + } } } @@ -143,8 +144,8 @@ enum class DifficultySystem { data class DifficultyGrade(val system: DifficultySystem, val grade: String, val numericValue: Int) { constructor( - system: DifficultySystem, - grade: String + system: DifficultySystem, + grade: String, ) : this(system = system, grade = grade, numericValue = calculateNumericValue(system, grade)) companion object { @@ -155,79 +156,80 @@ data class DifficultyGrade(val system: DifficultySystem, val grade: String, val } DifficultySystem.FONT -> { val fontMapping: Map = - mapOf( - "3" to 3, - "4A" to 4, - "4B" to 5, - "4C" to 6, - "5A" to 7, - "5B" to 8, - "5C" to 9, - "6A" to 10, - "6A+" to 11, - "6B" to 12, - "6B+" to 13, - "6C" to 14, - "6C+" to 15, - "7A" to 16, - "7A+" to 17, - "7B" to 18, - "7B+" to 19, - "7C" to 20, - "7C+" to 21, - "8A" to 22, - "8A+" to 23, - "8B" to 24, - "8B+" to 25, - "8C" to 26, - "8C+" to 27 - ) + mapOf( + "3" to 3, + "4A" to 4, + "4B" to 5, + "4C" to 6, + "5A" to 7, + "5B" to 8, + "5C" to 9, + "6A" to 10, + "6A+" to 11, + "6B" to 12, + "6B+" to 13, + "6C" to 14, + "6C+" to 15, + "7A" to 16, + "7A+" to 17, + "7B" to 18, + "7B+" to 19, + "7C" to 20, + "7C+" to 21, + "8A" to 22, + "8A+" to 23, + "8B" to 24, + "8B+" to 25, + "8C" to 26, + "8C+" to 27, + ) fontMapping[grade] ?: 0 } DifficultySystem.YDS -> { val ydsMapping: Map = - mapOf( - "5.0" to 50, - "5.1" to 51, - "5.2" to 52, - "5.3" to 53, - "5.4" to 54, - "5.5" to 55, - "5.6" to 56, - "5.7" to 57, - "5.8" to 58, - "5.9" to 59, - "5.10a" to 60, - "5.10b" to 61, - "5.10c" to 62, - "5.10d" to 63, - "5.11a" to 64, - "5.11b" to 65, - "5.11c" to 66, - "5.11d" to 67, - "5.12a" to 68, - "5.12b" to 69, - "5.12c" to 70, - "5.12d" to 71, - "5.13a" to 72, - "5.13b" to 73, - "5.13c" to 74, - "5.13d" to 75, - "5.14a" to 76, - "5.14b" to 77, - "5.14c" to 78, - "5.14d" to 79, - "5.15a" to 80, - "5.15b" to 81, - "5.15c" to 82, - "5.15d" to 83 - ) + mapOf( + "5.0" to 50, + "5.1" to 51, + "5.2" to 52, + "5.3" to 53, + "5.4" to 54, + "5.5" to 55, + "5.6" to 56, + "5.7" to 57, + "5.8" to 58, + "5.9" to 59, + "5.10a" to 60, + "5.10b" to 61, + "5.10c" to 62, + "5.10d" to 63, + "5.11a" to 64, + "5.11b" to 65, + "5.11c" to 66, + "5.11d" to 67, + "5.12a" to 68, + "5.12b" to 69, + "5.12c" to 70, + "5.12d" to 71, + "5.13a" to 72, + "5.13b" to 73, + "5.13c" to 74, + "5.13d" to 75, + "5.14a" to 76, + "5.14b" to 77, + "5.14c" to 78, + "5.14d" to 79, + "5.15a" to 80, + "5.15b" to 81, + "5.15c" to 82, + "5.15d" to 83, + ) ydsMapping[grade] ?: 0 } DifficultySystem.CUSTOM -> grade.toIntOrNull() ?: 0 } } } + /** * Compare this grade with another grade of the same system Returns negative if this grade is * easier, positive if harder, 0 if equal diff --git a/android/app/src/main/java/com/atridad/ascently/data/model/Gym.kt b/android/app/src/main/java/com/atridad/ascently/data/model/Gym.kt index c1670a4..7cea90f 100644 --- a/android/app/src/main/java/com/atridad/ascently/data/model/Gym.kt +++ b/android/app/src/main/java/com/atridad/ascently/data/model/Gym.kt @@ -8,36 +8,36 @@ import kotlinx.serialization.Serializable @Entity(tableName = "gyms") @Serializable data class Gym( - @PrimaryKey val id: String, - val name: String, - val location: String? = null, - val supportedClimbTypes: List, - val difficultySystems: List, - val customDifficultyGrades: List = emptyList(), - val notes: String? = null, - val createdAt: String, - val updatedAt: String + @PrimaryKey val id: String, + val name: String, + val location: String? = null, + val supportedClimbTypes: List, + val difficultySystems: List, + val customDifficultyGrades: List = emptyList(), + val notes: String? = null, + val createdAt: String, + val updatedAt: String, ) { companion object { fun create( - name: String, - location: String? = null, - supportedClimbTypes: List, - difficultySystems: List, - customDifficultyGrades: List = emptyList(), - notes: String? = null + name: String, + location: String? = null, + supportedClimbTypes: List, + difficultySystems: List, + customDifficultyGrades: List = emptyList(), + notes: String? = null, ): Gym { val now = DateFormatUtils.nowISO8601() return Gym( - id = java.util.UUID.randomUUID().toString(), - name = name, - location = location, - supportedClimbTypes = supportedClimbTypes, - difficultySystems = difficultySystems, - customDifficultyGrades = customDifficultyGrades, - notes = notes, - createdAt = now, - updatedAt = now + id = java.util.UUID.randomUUID().toString(), + name = name, + location = location, + supportedClimbTypes = supportedClimbTypes, + difficultySystems = difficultySystems, + customDifficultyGrades = customDifficultyGrades, + notes = notes, + createdAt = now, + updatedAt = now, ) } } diff --git a/android/app/src/main/java/com/atridad/ascently/data/model/Problem.kt b/android/app/src/main/java/com/atridad/ascently/data/model/Problem.kt index 2d3aa82..199ce44 100644 --- a/android/app/src/main/java/com/atridad/ascently/data/model/Problem.kt +++ b/android/app/src/main/java/com/atridad/ascently/data/model/Problem.kt @@ -8,63 +8,64 @@ import com.atridad.ascently.utils.DateFormatUtils import kotlinx.serialization.Serializable @Entity( - tableName = "problems", - foreignKeys = - [ - ForeignKey( - entity = Gym::class, - parentColumns = ["id"], - childColumns = ["gymId"], - onDelete = ForeignKey.CASCADE - )], - indices = [Index(value = ["gymId"])] + tableName = "problems", + foreignKeys = + [ + ForeignKey( + entity = Gym::class, + parentColumns = ["id"], + childColumns = ["gymId"], + onDelete = ForeignKey.CASCADE, + ), + ], + indices = [Index(value = ["gymId"])], ) @Serializable data class Problem( - @PrimaryKey val id: String, - val gymId: String, - val name: String? = null, - val description: String? = null, - val climbType: ClimbType, - val difficulty: DifficultyGrade, - val tags: List = emptyList(), - val location: String? = null, - val imagePaths: List = emptyList(), - val isActive: Boolean = true, - val dateSet: String? = null, - val notes: String? = null, - val createdAt: String, - val updatedAt: String + @PrimaryKey val id: String, + val gymId: String, + val name: String? = null, + val description: String? = null, + val climbType: ClimbType, + val difficulty: DifficultyGrade, + val tags: List = emptyList(), + val location: String? = null, + val imagePaths: List = emptyList(), + val isActive: Boolean = true, + val dateSet: String? = null, + val notes: String? = null, + val createdAt: String, + val updatedAt: String, ) { companion object { fun create( - gymId: String, - name: String? = null, - description: String? = null, - climbType: ClimbType, - difficulty: DifficultyGrade, - tags: List = emptyList(), - location: String? = null, - imagePaths: List = emptyList(), - dateSet: String? = null, - notes: String? = null + gymId: String, + name: String? = null, + description: String? = null, + climbType: ClimbType, + difficulty: DifficultyGrade, + tags: List = emptyList(), + location: String? = null, + imagePaths: List = emptyList(), + dateSet: String? = null, + notes: String? = null, ): Problem { val now = DateFormatUtils.nowISO8601() return Problem( - id = java.util.UUID.randomUUID().toString(), - gymId = gymId, - name = name, - description = description, - climbType = climbType, - difficulty = difficulty, - tags = tags, - location = location, - imagePaths = imagePaths, - isActive = true, - dateSet = dateSet, - notes = notes, - createdAt = now, - updatedAt = now + id = java.util.UUID.randomUUID().toString(), + gymId = gymId, + name = name, + description = description, + climbType = climbType, + difficulty = difficulty, + tags = tags, + location = location, + imagePaths = imagePaths, + isActive = true, + dateSet = dateSet, + notes = notes, + createdAt = now, + updatedAt = now, ) } } diff --git a/android/app/src/main/java/com/atridad/ascently/data/repository/ClimbRepository.kt b/android/app/src/main/java/com/atridad/ascently/data/repository/ClimbRepository.kt index 5d40f92..f80a158 100644 --- a/android/app/src/main/java/com/atridad/ascently/data/repository/ClimbRepository.kt +++ b/android/app/src/main/java/com/atridad/ascently/data/repository/ClimbRepository.kt @@ -12,13 +12,13 @@ import com.atridad.ascently.data.format.ClimbDataBackup import com.atridad.ascently.data.format.DeletedItem import com.atridad.ascently.data.model.* import com.atridad.ascently.data.state.DataStateManager -import com.atridad.ascently.utils.DateFormatUtils import com.atridad.ascently.utils.AppLogger +import com.atridad.ascently.utils.DateFormatUtils import com.atridad.ascently.utils.ZipExportImportUtils -import java.io.File import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.first import kotlinx.serialization.json.Json +import java.io.File class ClimbRepository(database: AscentlyDatabase, private val context: Context) { private val gymDao = database.gymDao() @@ -161,7 +161,7 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context) gyms = allGyms.map { BackupGym.fromGym(it) }, problems = allProblems.map { BackupProblem.fromProblem(it) }, sessions = allSessions.map { BackupClimbSession.fromClimbSession(it) }, - attempts = allAttempts.map { BackupAttempt.fromAttempt(it) } + attempts = allAttempts.map { BackupAttempt.fromAttempt(it) }, ) val referencedImagePaths = allProblems.flatMap { it.imagePaths }.toSet() @@ -172,7 +172,7 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context) val imageFile = com.atridad.ascently.utils.ImageUtils.getImageFile( context, - imagePath + imagePath, ) imageFile.exists() && imageFile.length() > 0 } catch (_: Exception) { @@ -185,7 +185,7 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context) context = context, uri = uri, exportData = backupData, - referencedImagePaths = validImagePaths + referencedImagePaths = validImagePaths, ) } catch (e: Exception) { throw Exception("Export failed: ${e.message}") @@ -229,7 +229,7 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context) val updatedBackupProblems = ZipExportImportUtils.updateProblemImagePaths( importData.problems, - importResult.importedImagePaths + importResult.importedImagePaths, ) updatedBackupProblems.forEach { backupProblem -> @@ -237,7 +237,7 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context) problemDao.insertProblem(backupProblem.toProblem()) } catch (e: Exception) { throw Exception( - "Failed to import problem '${backupProblem.name}': ${e.message}" + "Failed to import problem '${backupProblem.name}': ${e.message}", ) } } @@ -279,7 +279,7 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context) currentDeletions.add(newDeletion) val json = json.encodeToString(newDeletion) - deletionPreferences.edit { putString("deleted_${itemId}", json) } + deletionPreferences.edit { putString("deleted_$itemId", json) } } fun getDeletedItems(): List { @@ -308,20 +308,20 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context) gyms: List, problems: List, sessions: List, - attempts: List + attempts: List, ) { val gymIds = gyms.map { it.id }.toSet() val invalidProblems = problems.filter { it.gymId !in gymIds } if (invalidProblems.isNotEmpty()) { throw Exception( - "Data integrity error: ${invalidProblems.size} problems reference non-existent gyms" + "Data integrity error: ${invalidProblems.size} problems reference non-existent gyms", ) } val invalidSessions = sessions.filter { it.gymId !in gymIds } if (invalidSessions.isNotEmpty()) { throw Exception( - "Data integrity error: ${invalidSessions.size} sessions reference non-existent gyms" + "Data integrity error: ${invalidSessions.size} sessions reference non-existent gyms", ) } @@ -332,7 +332,7 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context) attempts.filter { it.problemId !in problemIds || it.sessionId !in sessionIds } if (invalidAttempts.isNotEmpty()) { throw Exception( - "Data integrity error: ${invalidAttempts.size} attempts reference non-existent problems or sessions" + "Data integrity error: ${invalidAttempts.size} attempts reference non-existent problems or sessions", ) } } diff --git a/android/app/src/main/java/com/atridad/ascently/data/sync/AscentlySyncProvider.kt b/android/app/src/main/java/com/atridad/ascently/data/sync/AscentlySyncProvider.kt index d84fac3..e241c7d 100644 --- a/android/app/src/main/java/com/atridad/ascently/data/sync/AscentlySyncProvider.kt +++ b/android/app/src/main/java/com/atridad/ascently/data/sync/AscentlySyncProvider.kt @@ -17,11 +17,6 @@ import com.atridad.ascently.utils.AppLogger import com.atridad.ascently.utils.DateFormatUtils import com.atridad.ascently.utils.ImageNamingUtils import com.atridad.ascently.utils.ImageUtils -import java.io.IOException -import java.text.SimpleDateFormat -import java.util.Date -import java.util.Locale -import java.util.concurrent.TimeUnit import kotlinx.coroutines.CancellationException import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow @@ -34,10 +29,15 @@ import okhttp3.MediaType.Companion.toMediaType import okhttp3.OkHttpClient import okhttp3.Request import okhttp3.RequestBody.Companion.toRequestBody +import java.io.IOException +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Locale +import java.util.concurrent.TimeUnit class AscentlySyncProvider( private val context: Context, - private val repository: ClimbRepository + private val repository: ClimbRepository, ) : SyncProvider { override val type: SyncProviderType = SyncProviderType.SERVER @@ -148,15 +148,15 @@ class AscentlySyncProvider( val hasLocalData = localBackup.gyms.isNotEmpty() || - localBackup.problems.isNotEmpty() || - localBackup.sessions.isNotEmpty() || - localBackup.attempts.isNotEmpty() + localBackup.problems.isNotEmpty() || + localBackup.sessions.isNotEmpty() || + localBackup.attempts.isNotEmpty() val hasServerData = serverBackup.gyms.isNotEmpty() || - serverBackup.problems.isNotEmpty() || - serverBackup.sessions.isNotEmpty() || - serverBackup.attempts.isNotEmpty() + serverBackup.problems.isNotEmpty() || + serverBackup.sessions.isNotEmpty() || + serverBackup.attempts.isNotEmpty() val lastSyncTimeStr = sharedPreferences.getString(Keys.LAST_SYNC_TIME, null) if (hasLocalData && hasServerData && lastSyncTimeStr != null) { @@ -268,7 +268,7 @@ class AscentlySyncProvider( problems = modifiedProblems, sessions = modifiedSessions, attempts = modifiedAttempts, - deletedItems = modifiedDeletions + deletedItems = modifiedDeletions, ) val requestBody = @@ -303,7 +303,9 @@ class AscentlySyncProvider( } AppLogger.d(TAG) { - "Delta sync received: gyms=${deltaResponse.gyms.size}, problems=${deltaResponse.problems.size}, sessions=${deltaResponse.sessions.size}, attempts=${deltaResponse.attempts.size}, deletions=${deltaResponse.deletedItems.size}" + "Delta sync received: gyms=${deltaResponse.gyms.size}, " + + "problems=${deltaResponse.problems.size}, sessions=${deltaResponse.sessions.size}, " + + "attempts=${deltaResponse.attempts.size}, deletions=${deltaResponse.deletedItems.size}" } applyDeltaResponse(deltaResponse) @@ -440,7 +442,7 @@ class AscentlySyncProvider( } private suspend fun applyDeletions( - deletions: List + deletions: List, ) { val existingGyms = repository.getAllGyms().first() val existingProblems = repository.getAllProblems().first() @@ -502,7 +504,7 @@ class AscentlySyncProvider( gyms = emptyList(), problems = emptyList(), sessions = emptyList(), - attempts = emptyList() + attempts = emptyList(), ) } } else { @@ -643,37 +645,37 @@ class AscentlySyncProvider( exportedAt = dataStateManager.getLastModified(), gyms = repository.getAllGyms().first().map { BackupGym.fromGym(it) }, problems = - repository.getAllProblems().first().map { problem -> - val backupProblem = BackupProblem.fromProblem(problem) - val normalizedImagePaths = - problem.imagePaths.mapIndexed { index, _ -> - ImageNamingUtils.generateImageFilename( - problem.id, - index - ) - } - if (normalizedImagePaths.isNotEmpty()) { - backupProblem.copy(imagePaths = normalizedImagePaths) - } else { - backupProblem + repository.getAllProblems().first().map { problem -> + val backupProblem = BackupProblem.fromProblem(problem) + val normalizedImagePaths = + problem.imagePaths.mapIndexed { index, _ -> + ImageNamingUtils.generateImageFilename( + problem.id, + index, + ) } - }, + if (normalizedImagePaths.isNotEmpty()) { + backupProblem.copy(imagePaths = normalizedImagePaths) + } else { + backupProblem + } + }, sessions = - repository.getAllSessions().first().map { - BackupClimbSession.fromClimbSession(it) - }, + repository.getAllSessions().first().map { + BackupClimbSession.fromClimbSession(it) + }, attempts = - repository.getAllAttempts().first().map { - BackupAttempt.fromAttempt(it) - }, - deletedItems = repository.getDeletedItems() + repository.getAllAttempts().first().map { + BackupAttempt.fromAttempt(it) + }, + deletedItems = repository.getDeletedItems(), ) } } private suspend fun importBackupToRepository( backup: ClimbDataBackup, - imagePathMapping: Map + imagePathMapping: Map, ) { val gyms = backup.gyms.map { it.toGym() } val problems = diff --git a/android/app/src/main/java/com/atridad/ascently/data/sync/DeltaSyncModels.kt b/android/app/src/main/java/com/atridad/ascently/data/sync/DeltaSyncModels.kt index d6f1563..495452d 100644 --- a/android/app/src/main/java/com/atridad/ascently/data/sync/DeltaSyncModels.kt +++ b/android/app/src/main/java/com/atridad/ascently/data/sync/DeltaSyncModels.kt @@ -10,21 +10,21 @@ import kotlinx.serialization.Serializable /** Request structure for delta sync - sends only changes since last sync */ @Serializable data class DeltaSyncRequest( - val lastSyncTime: String, - val gyms: List, - val problems: List, - val sessions: List, - val attempts: List, - val deletedItems: List + val lastSyncTime: String, + val gyms: List, + val problems: List, + val sessions: List, + val attempts: List, + val deletedItems: List, ) /** Response structure for delta sync - receives only changes from server */ @Serializable data class DeltaSyncResponse( - val serverTime: String, - val gyms: List, - val problems: List, - val sessions: List, - val attempts: List, - val deletedItems: List + val serverTime: String, + val gyms: List, + val problems: List, + val sessions: List, + val attempts: List, + val deletedItems: List, ) diff --git a/android/app/src/main/java/com/atridad/ascently/data/sync/SyncProvider.kt b/android/app/src/main/java/com/atridad/ascently/data/sync/SyncProvider.kt index ab3bcf1..c44bd8a 100644 --- a/android/app/src/main/java/com/atridad/ascently/data/sync/SyncProvider.kt +++ b/android/app/src/main/java/com/atridad/ascently/data/sync/SyncProvider.kt @@ -6,7 +6,7 @@ interface SyncProvider { val type: SyncProviderType val isConfigured: StateFlow val isConnected: StateFlow - + suspend fun sync() suspend fun testConnection() fun disconnect() @@ -14,5 +14,5 @@ interface SyncProvider { enum class SyncProviderType { NONE, - SERVER + SERVER, } diff --git a/android/app/src/main/java/com/atridad/ascently/data/sync/SyncService.kt b/android/app/src/main/java/com/atridad/ascently/data/sync/SyncService.kt index baa2d91..2c68e3a 100644 --- a/android/app/src/main/java/com/atridad/ascently/data/sync/SyncService.kt +++ b/android/app/src/main/java/com/atridad/ascently/data/sync/SyncService.kt @@ -101,10 +101,9 @@ class SyncService(private val context: Context, private val repository: ClimbRep try { provider.sync() - + // Update last sync time from shared prefs (provider updates it) _lastSyncTime.value = sharedPreferences.getString(Keys.LAST_SYNC_TIME, null) - } catch (e: Exception) { _syncError.value = e.message throw e diff --git a/android/app/src/main/java/com/atridad/ascently/navigation/BottomNavigationItem.kt b/android/app/src/main/java/com/atridad/ascently/navigation/BottomNavigationItem.kt index 2a223c3..88b29db 100644 --- a/android/app/src/main/java/com/atridad/ascently/navigation/BottomNavigationItem.kt +++ b/android/app/src/main/java/com/atridad/ascently/navigation/BottomNavigationItem.kt @@ -7,30 +7,30 @@ import androidx.compose.ui.graphics.vector.ImageVector data class BottomNavigationItem(val screen: Screen, val icon: ImageVector, val label: String) val bottomNavigationItems = - listOf( - BottomNavigationItem( - screen = Screen.Sessions, - icon = Icons.Default.PlayArrow, - label = "Sessions" - ), - BottomNavigationItem( - screen = Screen.Problems, - icon = Icons.Default.Star, - label = "Problems" - ), - BottomNavigationItem( - screen = Screen.Analytics, - icon = Icons.Default.Info, - label = "Analytics" - ), - BottomNavigationItem( - screen = Screen.Gyms, - icon = Icons.Default.LocationOn, - label = "Gyms" - ), - BottomNavigationItem( - screen = Screen.Settings, - icon = Icons.Default.Settings, - label = "Settings" - ) - ) + listOf( + BottomNavigationItem( + screen = Screen.Sessions, + icon = Icons.Default.PlayArrow, + label = "Sessions", + ), + BottomNavigationItem( + screen = Screen.Problems, + icon = Icons.Default.Star, + label = "Problems", + ), + BottomNavigationItem( + screen = Screen.Analytics, + icon = Icons.Default.Info, + label = "Analytics", + ), + BottomNavigationItem( + screen = Screen.Gyms, + icon = Icons.Default.LocationOn, + label = "Gyms", + ), + BottomNavigationItem( + screen = Screen.Settings, + icon = Icons.Default.Settings, + label = "Settings", + ), + ) diff --git a/android/app/src/main/java/com/atridad/ascently/service/SessionTrackingService.kt b/android/app/src/main/java/com/atridad/ascently/service/SessionTrackingService.kt index 2c4f07f..74fbc21 100644 --- a/android/app/src/main/java/com/atridad/ascently/service/SessionTrackingService.kt +++ b/android/app/src/main/java/com/atridad/ascently/service/SessionTrackingService.kt @@ -16,12 +16,12 @@ import com.atridad.ascently.data.database.AscentlyDatabase import com.atridad.ascently.data.repository.ClimbRepository import com.atridad.ascently.utils.AppLogger import com.atridad.ascently.widget.ClimbStatsWidgetProvider -import java.time.LocalDateTime -import java.time.ZoneId -import java.time.temporal.ChronoUnit import kotlinx.coroutines.* import kotlinx.coroutines.flow.firstOrNull import kotlinx.coroutines.runBlocking +import java.time.LocalDateTime +import java.time.ZoneId +import java.time.temporal.ChronoUnit class SessionTrackingService : Service() { @@ -224,12 +224,12 @@ class SessionTrackingService : Service() { .addAction( R.drawable.ic_mountains, "Open Session", - createOpenAppIntent() + createOpenAppIntent(), ) .addAction( android.R.drawable.ic_menu_close_clear_cancel, "End Session", - createStopPendingIntent(sessionId) + createStopPendingIntent(sessionId), ) // Use Live Update @@ -249,7 +249,7 @@ class SessionTrackingService : Service() { notificationBuilder .setContentTitle("Climbing Session Active") .setContentText( - "${gym?.name ?: "Gym"} • ${attempts.size} attempts" + "${gym?.name ?: "Gym"} • ${attempts.size} attempts", ) .setWhen(startTimeMillis) .setUsesChronometer(true) @@ -284,7 +284,7 @@ class SessionTrackingService : Service() { notificationBuilder .setContentTitle("Climbing Session Active") .setContentText( - "${gym?.name ?: "Gym"} • $duration • ${attempts.size} attempts" + "${gym?.name ?: "Gym"} • $duration • ${attempts.size} attempts", ) } @@ -309,7 +309,7 @@ class SessionTrackingService : Service() { this, 0, intent, - PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE + PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE, ) } @@ -319,7 +319,7 @@ class SessionTrackingService : Service() { this, 1, intent, - PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE + PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE, ) } @@ -328,7 +328,7 @@ class SessionTrackingService : Service() { NotificationChannel( CHANNEL_ID, "Session Tracking", - NotificationManager.IMPORTANCE_DEFAULT + NotificationManager.IMPORTANCE_DEFAULT, ) .apply { description = "Shows active climbing session information" diff --git a/android/app/src/main/java/com/atridad/ascently/ui/AscentlyApp.kt b/android/app/src/main/java/com/atridad/ascently/ui/AscentlyApp.kt index 4b05778..061a78c 100644 --- a/android/app/src/main/java/com/atridad/ascently/ui/AscentlyApp.kt +++ b/android/app/src/main/java/com/atridad/ascently/ui/AscentlyApp.kt @@ -35,7 +35,7 @@ import com.atridad.ascently.utils.NotificationPermissionUtils fun AscentlyApp( shortcutAction: String? = null, lastUsedGymId: String? = null, - onShortcutActionProcessed: () -> Unit = {} + onShortcutActionProcessed: () -> Unit = {}, ) { val navController = rememberNavController() val context = LocalContext.current @@ -53,7 +53,7 @@ fun AscentlyApp( val permissionLauncher = rememberLauncherForActivityResult( - contract = ActivityResultContracts.RequestPermission() + contract = ActivityResultContracts.RequestPermission(), ) { isGranted: Boolean -> if (!isGranted) { showNotificationPermissionDialog = false @@ -90,7 +90,7 @@ fun AscentlyApp( context = context, hasActiveSession = activeSession != null, hasGyms = gyms.isNotEmpty(), - lastUsedGym = if (activeSession == null && gyms.size > 1) lastUsedGym else null + lastUsedGym = if (activeSession == null && gyms.size > 1) lastUsedGym else null, ) } @@ -121,7 +121,7 @@ fun AscentlyApp( if (activeSession == null) { if (NotificationPermissionUtils.shouldRequestNotificationPermission() && !NotificationPermissionUtils.isNotificationPermissionGranted( - context + context, ) ) { AppLogger.d("AscentlyApp") { "Showing notification permission dialog" } @@ -160,20 +160,20 @@ fun AscentlyApp( fabConfig?.let { config -> FloatingActionButton( onClick = config.onClick, - containerColor = MaterialTheme.colorScheme.primary + containerColor = MaterialTheme.colorScheme.primary, ) { Icon( imageVector = config.icon, - contentDescription = config.contentDescription + contentDescription = config.contentDescription, ) } } - } + }, ) { innerPadding -> NavHost( navController = navController, startDestination = Screen.Sessions, - modifier = Modifier.padding(innerPadding) + modifier = Modifier.padding(innerPadding), ) { composable { LaunchedEffect(gyms, activeSession) { @@ -187,14 +187,14 @@ fun AscentlyApp( .shouldRequestNotificationPermission() && !NotificationPermissionUtils .isNotificationPermissionGranted( - context + context, ) ) { showNotificationPermissionDialog = true } else { navController.navigate(Screen.AddEditSession()) } - } + }, ) } else { null @@ -204,7 +204,7 @@ fun AscentlyApp( viewModel = viewModel, onNavigateToSessionDetail = { sessionId -> navController.navigate(Screen.SessionDetail(sessionId)) - } + }, ) } @@ -217,7 +217,7 @@ fun AscentlyApp( contentDescription = "Add Problem", onClick = { navController.navigate(Screen.AddEditProblem()) - } + }, ) } else { null @@ -227,7 +227,7 @@ fun AscentlyApp( viewModel = viewModel, onNavigateToProblemDetail = { problemId -> navController.navigate(Screen.ProblemDetail(problemId)) - } + }, ) } @@ -242,14 +242,14 @@ fun AscentlyApp( FabConfig( icon = Icons.Default.Add, contentDescription = "Add Gym", - onClick = { navController.navigate(Screen.AddEditGym()) } + onClick = { navController.navigate(Screen.AddEditGym()) }, ) } GymsScreen( viewModel = viewModel, onNavigateToGymDetail = { gymId -> navController.navigate(Screen.GymDetail(gymId)) - } + }, ) } @@ -267,7 +267,7 @@ fun AscentlyApp( onNavigateBack = { navController.popBackStack() }, onNavigateToProblemDetail = { problemId -> navController.navigate(Screen.ProblemDetail(problemId)) - } + }, ) } @@ -280,7 +280,7 @@ fun AscentlyApp( onNavigateBack = { navController.popBackStack() }, onNavigateToEdit = { problemId -> navController.navigate(Screen.AddEditProblem(problemId = problemId)) - } + }, ) } @@ -299,7 +299,7 @@ fun AscentlyApp( }, onNavigateToProblemDetail = { problemId -> navController.navigate(Screen.ProblemDetail(problemId)) - } + }, ) } @@ -309,7 +309,7 @@ fun AscentlyApp( AddEditGymScreen( gymId = args.gymId, viewModel = viewModel, - onNavigateBack = { navController.popBackStack() } + onNavigateBack = { navController.popBackStack() }, ) } @@ -320,7 +320,7 @@ fun AscentlyApp( problemId = args.problemId, gymId = args.gymId, viewModel = viewModel, - onNavigateBack = { navController.popBackStack() } + onNavigateBack = { navController.popBackStack() }, ) } @@ -331,7 +331,7 @@ fun AscentlyApp( sessionId = args.sessionId, gymId = args.gymId, viewModel = viewModel, - onNavigateBack = { navController.popBackStack() } + onNavigateBack = { navController.popBackStack() }, ) } } @@ -341,9 +341,9 @@ fun AscentlyApp( onDismiss = { showNotificationPermissionDialog = false }, onRequestPermission = { permissionLauncher.launch( - NotificationPermissionUtils.getNotificationPermissionString() + NotificationPermissionUtils.getNotificationPermissionString(), ) - } + }, ) } } @@ -377,7 +377,7 @@ fun AscentlyBottomNavigation(navController: NavHostController) { // Don't restore state - always start fresh when switching tabs restoreState = false } - } + }, ) } } @@ -386,5 +386,5 @@ fun AscentlyBottomNavigation(navController: NavHostController) { data class FabConfig( val icon: androidx.compose.ui.graphics.vector.ImageVector, val contentDescription: String, - val onClick: () -> Unit + val onClick: () -> Unit, ) diff --git a/android/app/src/main/java/com/atridad/ascently/ui/components/ActiveSessionBanner.kt b/android/app/src/main/java/com/atridad/ascently/ui/components/ActiveSessionBanner.kt index c54e743..4d6f456 100644 --- a/android/app/src/main/java/com/atridad/ascently/ui/components/ActiveSessionBanner.kt +++ b/android/app/src/main/java/com/atridad/ascently/ui/components/ActiveSessionBanner.kt @@ -22,81 +22,81 @@ fun ActiveSessionBanner( activeSession: ClimbSession?, gym: Gym?, onSessionClick: () -> Unit, - onEndSession: () -> Unit -) { + onEndSession: () -> Unit, +) { if (activeSession != null) { // Add a timer that updates every second for real-time duration counting var currentTime by remember { mutableStateOf(LocalDateTime.now()) } - + LaunchedEffect(Unit) { while (true) { delay(1000) // Update every second currentTime = LocalDateTime.now() } } - + Card( modifier = Modifier .fillMaxWidth() .clickable { onSessionClick() }, colors = CardDefaults.cardColors( - containerColor = MaterialTheme.colorScheme.primaryContainer - ) + containerColor = MaterialTheme.colorScheme.primaryContainer, + ), ) { Row( modifier = Modifier .fillMaxWidth() .padding(16.dp), horizontalArrangement = Arrangement.SpaceBetween, - verticalAlignment = Alignment.CenterVertically + verticalAlignment = Alignment.CenterVertically, ) { Column(modifier = Modifier.weight(1f)) { Row( - verticalAlignment = Alignment.CenterVertically + verticalAlignment = Alignment.CenterVertically, ) { Icon( Icons.Default.PlayArrow, contentDescription = "Active session", tint = MaterialTheme.colorScheme.primary, - modifier = Modifier.size(16.dp) + modifier = Modifier.size(16.dp), ) Spacer(modifier = Modifier.width(8.dp)) Text( text = "Active Session", style = MaterialTheme.typography.titleSmall, fontWeight = FontWeight.Bold, - color = MaterialTheme.colorScheme.onPrimaryContainer + color = MaterialTheme.colorScheme.onPrimaryContainer, ) } - + Spacer(modifier = Modifier.height(4.dp)) - + Text( text = gym?.name ?: "Unknown Gym", style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onPrimaryContainer + color = MaterialTheme.colorScheme.onPrimaryContainer, ) - + activeSession.startTime?.let { startTime -> val duration = calculateDuration(startTime, currentTime) Text( text = duration, style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onPrimaryContainer.copy(alpha = 0.8f) + color = MaterialTheme.colorScheme.onPrimaryContainer.copy(alpha = 0.8f), ) } } - + IconButton( onClick = onEndSession, colors = IconButtonDefaults.iconButtonColors( containerColor = MaterialTheme.colorScheme.error, - contentColor = MaterialTheme.colorScheme.onError - ) + contentColor = MaterialTheme.colorScheme.onError, + ), ) { Icon( imageVector = CustomIcons.Stop(MaterialTheme.colorScheme.onError), - contentDescription = "End session" + contentDescription = "End session", ) } } @@ -111,7 +111,7 @@ private fun calculateDuration(startTimeString: String, currentTime: LocalDateTim val hours = totalSeconds / 3600 val minutes = (totalSeconds % 3600) / 60 val seconds = totalSeconds % 60 - + when { hours > 0 -> "${hours}h ${minutes}m ${seconds}s" minutes > 0 -> "${minutes}m ${seconds}s" diff --git a/android/app/src/main/java/com/atridad/ascently/ui/components/BarChart.kt b/android/app/src/main/java/com/atridad/ascently/ui/components/BarChart.kt index fdb0d60..e49229b 100644 --- a/android/app/src/main/java/com/atridad/ascently/ui/components/BarChart.kt +++ b/android/app/src/main/java/com/atridad/ascently/ui/components/BarChart.kt @@ -23,25 +23,25 @@ data class BarChartDataPoint(val label: String, val value: Int, val gradeNumeric /** Configuration for bar chart styling */ data class BarChartStyle( - val barColor: Color, - val gridColor: Color, - val textColor: Color, - val backgroundColor: Color + val barColor: Color, + val gridColor: Color, + val textColor: Color, + val backgroundColor: Color, ) /** Custom Bar Chart for displaying grade distribution */ @Composable fun BarChart( - data: List, - modifier: Modifier = Modifier, - style: BarChartStyle = - BarChartStyle( - barColor = MaterialTheme.colorScheme.primary, - gridColor = MaterialTheme.colorScheme.outline.copy(alpha = 0.3f), - textColor = MaterialTheme.colorScheme.onSurfaceVariant, - backgroundColor = MaterialTheme.colorScheme.surface - ), - showGrid: Boolean = true + data: List, + modifier: Modifier = Modifier, + style: BarChartStyle = + BarChartStyle( + barColor = MaterialTheme.colorScheme.primary, + gridColor = MaterialTheme.colorScheme.outline.copy(alpha = 0.3f), + textColor = MaterialTheme.colorScheme.onSurfaceVariant, + backgroundColor = MaterialTheme.colorScheme.surface, + ), + showGrid: Boolean = true, ) { val textMeasurer = rememberTextMeasurer() val density = LocalDensity.current @@ -68,42 +68,44 @@ fun BarChart( // Draw background drawRect( - color = style.backgroundColor, - topLeft = Offset(padding, padding), - size = androidx.compose.ui.geometry.Size(chartWidth, chartHeight) + color = style.backgroundColor, + topLeft = Offset(padding, padding), + size = androidx.compose.ui.geometry.Size(chartWidth, chartHeight), ) // Draw grid if (showGrid) { drawGrid( - padding = padding, - chartWidth = chartWidth, - chartHeight = chartHeight, - gridColor = style.gridColor, - maxValue = maxValue, - textMeasurer = textMeasurer, - textColor = style.textColor + padding = padding, + chartWidth = chartWidth, + chartHeight = chartHeight, + gridColor = style.gridColor, + maxValue = maxValue, + textMeasurer = textMeasurer, + textColor = style.textColor, ) } // Draw bars and labels sortedData.forEachIndexed { index, dataPoint -> val barHeight = - if (maxValue > 0) { - (dataPoint.value.toFloat() / maxValue.toFloat()) * chartHeight * 0.8f - } else 0f + if (maxValue > 0) { + (dataPoint.value.toFloat() / maxValue.toFloat()) * chartHeight * 0.8f + } else { + 0f + } val barX = - padding + - barSpacing + - index * (barWidth + barSpacing / (barCount - 1).coerceAtLeast(1)) + padding + + barSpacing + + index * (barWidth + barSpacing / (barCount - 1).coerceAtLeast(1)) val barY = padding + chartHeight - barHeight // Draw bar drawRect( - color = style.barColor, - topLeft = Offset(barX, barY), - size = androidx.compose.ui.geometry.Size(barWidth, barHeight) + color = style.barColor, + topLeft = Offset(barX, barY), + size = androidx.compose.ui.geometry.Size(barWidth, barHeight), ) // Draw value on bar @@ -114,24 +116,24 @@ fun BarChart( // Position text val textY = - if (barHeight > textSize.size.height + 8.dp.toPx()) { - barY + 8.dp.toPx() - } else { - barY - 4.dp.toPx() - } + if (barHeight > textSize.size.height + 8.dp.toPx()) { + barY + 8.dp.toPx() + } else { + barY - 4.dp.toPx() + } val textColor = - if (barHeight > textSize.size.height + 8.dp.toPx()) { - Color.White - } else { - style.textColor - } + if (barHeight > textSize.size.height + 8.dp.toPx()) { + Color.White + } else { + style.textColor + } drawText( - textMeasurer = textMeasurer, - text = valueText, - style = textStyle.copy(color = textColor), - topLeft = Offset(barX + barWidth / 2f - textSize.size.width / 2f, textY) + textMeasurer = textMeasurer, + text = valueText, + style = textStyle.copy(color = textColor), + topLeft = Offset(barX + barWidth / 2f - textSize.size.width / 2f, textY), ) } @@ -141,14 +143,14 @@ fun BarChart( val labelTextSize = textMeasurer.measure(gradeText, labelTextStyle) drawText( - textMeasurer = textMeasurer, - text = gradeText, - style = labelTextStyle, - topLeft = - Offset( - barX + barWidth / 2f - labelTextSize.size.width / 2f, - padding + chartHeight + 8.dp.toPx() - ) + textMeasurer = textMeasurer, + text = gradeText, + style = labelTextStyle, + topLeft = + Offset( + barX + barWidth / 2f - labelTextSize.size.width / 2f, + padding + chartHeight + 8.dp.toPx(), + ), ) } } @@ -156,37 +158,37 @@ fun BarChart( } private fun DrawScope.drawGrid( - padding: Float, - chartWidth: Float, - chartHeight: Float, - gridColor: Color, - maxValue: Int, - textMeasurer: TextMeasurer, - textColor: Color + padding: Float, + chartWidth: Float, + chartHeight: Float, + gridColor: Color, + maxValue: Int, + textMeasurer: TextMeasurer, + textColor: Color, ) { val textStyle = TextStyle(color = textColor, fontSize = 10.sp) // Horizontal grid lines val gridLines = - when { - maxValue <= 5 -> (0..maxValue).toList() - maxValue <= 10 -> (0..maxValue step 2).toList() - maxValue <= 20 -> (0..maxValue step 5).toList() - else -> { - val step = (maxValue / 5).coerceAtLeast(1) - (0..maxValue step step).toList() - } + when { + maxValue <= 5 -> (0..maxValue).toList() + maxValue <= 10 -> (0..maxValue step 2).toList() + maxValue <= 20 -> (0..maxValue step 5).toList() + else -> { + val step = (maxValue / 5).coerceAtLeast(1) + (0..maxValue step step).toList() } + } gridLines.forEach { value -> val y = padding + chartHeight - (value.toFloat() / maxValue.toFloat()) * chartHeight * 0.8f // Draw grid line drawLine( - color = gridColor, - start = Offset(padding, y), - end = Offset(padding + chartWidth, y), - strokeWidth = 1.dp.toPx() + color = gridColor, + start = Offset(padding, y), + end = Offset(padding + chartWidth, y), + strokeWidth = 1.dp.toPx(), ) // Draw Y-axis label @@ -194,14 +196,14 @@ private fun DrawScope.drawGrid( val text = value.toString() val textSize = textMeasurer.measure(text, textStyle) drawText( - textMeasurer = textMeasurer, - text = text, - style = textStyle, - topLeft = - Offset( - padding - textSize.size.width - 8.dp.toPx(), - y - textSize.size.height / 2f - ) + textMeasurer = textMeasurer, + text = text, + style = textStyle, + topLeft = + Offset( + padding - textSize.size.width - 8.dp.toPx(), + y - textSize.size.height / 2f, + ), ) } } diff --git a/android/app/src/main/java/com/atridad/ascently/ui/components/FullscreenImageViewer.kt b/android/app/src/main/java/com/atridad/ascently/ui/components/FullscreenImageViewer.kt index d219a51..1e5497d 100644 --- a/android/app/src/main/java/com/atridad/ascently/ui/components/FullscreenImageViewer.kt +++ b/android/app/src/main/java/com/atridad/ascently/ui/components/FullscreenImageViewer.kt @@ -40,44 +40,44 @@ fun FullscreenImageViewer(imagePaths: List, initialIndex: Int = 0, onDis LaunchedEffect(pagerState.currentPage) { if (imagePaths.size > 1) { thumbnailListState.animateScrollToItem( - index = pagerState.currentPage, - scrollOffset = -200 + index = pagerState.currentPage, + scrollOffset = -200, ) } } Dialog( - onDismissRequest = onDismiss, - properties = - DialogProperties(usePlatformDefaultWidth = false, decorFitsSystemWindows = true) + onDismissRequest = onDismiss, + properties = + DialogProperties(usePlatformDefaultWidth = false, decorFitsSystemWindows = true), ) { Box(modifier = Modifier.fillMaxSize().background(Color.Black).systemBarsPadding()) { // Main image pager HorizontalPager(state = pagerState, modifier = Modifier.fillMaxSize()) { page -> OrientationAwareImage( - imagePath = imagePaths[page], - contentDescription = "Full screen image", - modifier = Modifier.fillMaxSize(), - contentScale = ContentScale.Fit + imagePath = imagePaths[page], + contentDescription = "Full screen image", + modifier = Modifier.fillMaxSize(), + contentScale = ContentScale.Fit, ) } // Top bar with back button and counter Surface( - modifier = Modifier.fillMaxWidth().align(Alignment.TopStart), - color = Color.Black.copy(alpha = 0.6f) + modifier = Modifier.fillMaxWidth().align(Alignment.TopStart), + color = Color.Black.copy(alpha = 0.6f), ) { Row( - modifier = - Modifier.fillMaxWidth().padding(horizontal = 4.dp, vertical = 8.dp), - verticalAlignment = Alignment.CenterVertically + modifier = + Modifier.fillMaxWidth().padding(horizontal = 4.dp, vertical = 8.dp), + verticalAlignment = Alignment.CenterVertically, ) { // Back button IconButton(onClick = onDismiss) { Icon( - imageVector = Icons.AutoMirrored.Filled.ArrowBack, - contentDescription = "Close", - tint = Color.White + imageVector = Icons.AutoMirrored.Filled.ArrowBack, + contentDescription = "Close", + tint = Color.White, ) } @@ -86,9 +86,9 @@ fun FullscreenImageViewer(imagePaths: List, initialIndex: Int = 0, onDis // Image counter if (imagePaths.size > 1) { Text( - text = "${pagerState.currentPage + 1} / ${imagePaths.size}", - color = Color.White, - style = MaterialTheme.typography.bodyMedium + text = "${pagerState.currentPage + 1} / ${imagePaths.size}", + color = Color.White, + style = MaterialTheme.typography.bodyMedium, ) } @@ -99,56 +99,56 @@ fun FullscreenImageViewer(imagePaths: List, initialIndex: Int = 0, onDis // Thumbnail strip at bottom (if multiple images) if (imagePaths.size > 1) { Surface( - modifier = Modifier.fillMaxWidth().align(Alignment.BottomCenter), - color = Color.Black.copy(alpha = 0.6f) + modifier = Modifier.fillMaxWidth().align(Alignment.BottomCenter), + color = Color.Black.copy(alpha = 0.6f), ) { LazyRow( - state = thumbnailListState, - modifier = Modifier.padding(vertical = 12.dp), - horizontalArrangement = Arrangement.spacedBy(8.dp), - contentPadding = PaddingValues(horizontal = 16.dp) + state = thumbnailListState, + modifier = Modifier.padding(vertical = 12.dp), + horizontalArrangement = Arrangement.spacedBy(8.dp), + contentPadding = PaddingValues(horizontal = 16.dp), ) { itemsIndexed(imagePaths) { index, imagePath -> val isSelected = index == pagerState.currentPage Box( - modifier = - Modifier.size(48.dp) - .clip(RoundedCornerShape(8.dp)) - .clickable { - coroutineScope.launch { - pagerState.animateScrollToPage(index) - } - } + modifier = + Modifier.size(48.dp) + .clip(RoundedCornerShape(8.dp)) + .clickable { + coroutineScope.launch { + pagerState.animateScrollToPage(index) + } + }, ) { OrientationAwareImage( - imagePath = imagePath, - contentDescription = "Thumbnail ${index + 1}", - modifier = Modifier.fillMaxSize(), - contentScale = ContentScale.Crop + imagePath = imagePath, + contentDescription = "Thumbnail ${index + 1}", + modifier = Modifier.fillMaxSize(), + contentScale = ContentScale.Crop, ) // Selection indicator if (isSelected) { Box( - modifier = - Modifier.fillMaxSize() - .background( - Color.White.copy(alpha = 0.3f), - RoundedCornerShape(8.dp) - ) + modifier = + Modifier.fillMaxSize() + .background( + Color.White.copy(alpha = 0.3f), + RoundedCornerShape(8.dp), + ), ) Box( - modifier = - Modifier.fillMaxSize() - .background( - Color.Transparent, - RoundedCornerShape(8.dp) - ) - .clip(RoundedCornerShape(8.dp)) - .background( - Color.White.copy(alpha = 0.2f) - ) + modifier = + Modifier.fillMaxSize() + .background( + Color.Transparent, + RoundedCornerShape(8.dp), + ) + .clip(RoundedCornerShape(8.dp)) + .background( + Color.White.copy(alpha = 0.2f), + ), ) } } diff --git a/android/app/src/main/java/com/atridad/ascently/ui/components/ImageDisplay.kt b/android/app/src/main/java/com/atridad/ascently/ui/components/ImageDisplay.kt index 36d18e1..9eb6105 100644 --- a/android/app/src/main/java/com/atridad/ascently/ui/components/ImageDisplay.kt +++ b/android/app/src/main/java/com/atridad/ascently/ui/components/ImageDisplay.kt @@ -15,10 +15,10 @@ import androidx.compose.ui.unit.dp @Composable fun ImageDisplay( - imagePaths: List, - modifier: Modifier = Modifier, - imageSize: Int = 120, - onImageClick: ((Int) -> Unit)? = null + imagePaths: List, + modifier: Modifier = Modifier, + imageSize: Int = 120, + onImageClick: ((Int) -> Unit)? = null, ) { LocalContext.current @@ -26,15 +26,15 @@ fun ImageDisplay( LazyRow(modifier = modifier, horizontalArrangement = Arrangement.spacedBy(8.dp)) { itemsIndexed(imagePaths) { index, imagePath -> OrientationAwareImage( - imagePath = imagePath, - contentDescription = "Problem photo", - modifier = - Modifier.size(imageSize.dp) - .clip(RoundedCornerShape(8.dp)) - .clickable(enabled = onImageClick != null) { - onImageClick?.invoke(index) - }, - contentScale = ContentScale.Crop + imagePath = imagePath, + contentDescription = "Problem photo", + modifier = + Modifier.size(imageSize.dp) + .clip(RoundedCornerShape(8.dp)) + .clickable(enabled = onImageClick != null) { + onImageClick?.invoke(index) + }, + contentScale = ContentScale.Crop, ) } } @@ -43,17 +43,17 @@ fun ImageDisplay( @Composable fun ImageDisplaySection( - imagePaths: List, - modifier: Modifier = Modifier, - title: String = "Photos", - onImageClick: ((Int) -> Unit)? = null + imagePaths: List, + modifier: Modifier = Modifier, + title: String = "Photos", + onImageClick: ((Int) -> Unit)? = null, ) { if (imagePaths.isNotEmpty()) { Column(modifier = modifier) { Text( - text = title, - style = MaterialTheme.typography.titleMedium, - color = MaterialTheme.colorScheme.onSurface + text = title, + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.onSurface, ) Spacer(modifier = Modifier.height(8.dp)) diff --git a/android/app/src/main/java/com/atridad/ascently/ui/components/ImagePicker.kt b/android/app/src/main/java/com/atridad/ascently/ui/components/ImagePicker.kt index 0422d96..562a7b7 100644 --- a/android/app/src/main/java/com/atridad/ascently/ui/components/ImagePicker.kt +++ b/android/app/src/main/java/com/atridad/ascently/ui/components/ImagePicker.kt @@ -32,10 +32,10 @@ import java.util.* @Composable fun ImagePicker( - imageUris: List, - onImagesChanged: (List) -> Unit, - modifier: Modifier = Modifier, - maxImages: Int = 5 + imageUris: List, + onImagesChanged: (List) -> Unit, + modifier: Modifier = Modifier, + maxImages: Int = 5, ) { val context = LocalContext.current var tempImageUris by remember { mutableStateOf(imageUris) } @@ -44,83 +44,83 @@ fun ImagePicker( // Image picker launcher val imagePickerLauncher = - rememberLauncherForActivityResult( - contract = ActivityResultContracts.GetMultipleContents() - ) { uris -> - if (uris.isNotEmpty()) { - val currentCount = tempImageUris.size - val remainingSlots = maxImages - currentCount - val urisToProcess = uris.take(remainingSlots) + rememberLauncherForActivityResult( + contract = ActivityResultContracts.GetMultipleContents(), + ) { uris -> + if (uris.isNotEmpty()) { + val currentCount = tempImageUris.size + val remainingSlots = maxImages - currentCount + val urisToProcess = uris.take(remainingSlots) - // Process images - val newImagePaths = mutableListOf() - urisToProcess.forEach { uri -> - val imagePath = ImageUtils.saveTemporaryImageFromUri(context, uri) - if (imagePath != null) { - newImagePaths.add(imagePath) - } + // Process images + val newImagePaths = mutableListOf() + urisToProcess.forEach { uri -> + val imagePath = ImageUtils.saveTemporaryImageFromUri(context, uri) + if (imagePath != null) { + newImagePaths.add(imagePath) } + } - if (newImagePaths.isNotEmpty()) { - val updatedUris = tempImageUris + newImagePaths + if (newImagePaths.isNotEmpty()) { + val updatedUris = tempImageUris + newImagePaths + tempImageUris = updatedUris + onImagesChanged(updatedUris) + } + } + } + + // Camera launcher + val cameraLauncher = + rememberLauncherForActivityResult(contract = ActivityResultContracts.TakePicture()) { + success -> + if (success) { + cameraImageUri?.let { uri -> + val imagePath = ImageUtils.saveTemporaryImageFromUri(context, uri) + if (imagePath != null) { + val updatedUris = tempImageUris + imagePath tempImageUris = updatedUris onImagesChanged(updatedUris) } } } - - // Camera launcher - val cameraLauncher = - rememberLauncherForActivityResult(contract = ActivityResultContracts.TakePicture()) { - success -> - if (success) { - cameraImageUri?.let { uri -> - val imagePath = ImageUtils.saveTemporaryImageFromUri(context, uri) - if (imagePath != null) { - val updatedUris = tempImageUris + imagePath - tempImageUris = updatedUris - onImagesChanged(updatedUris) - } - } - } - } + } // Camera permission launcher val cameraPermissionLauncher = - rememberLauncherForActivityResult( - contract = ActivityResultContracts.RequestPermission() - ) { isGranted -> - if (isGranted) { - // Create image file for camera - val imageFile = createImageFile(context) - val uri = - FileProvider.getUriForFile( - context, - "${context.packageName}.fileprovider", - imageFile - ) - cameraImageUri = uri - cameraLauncher.launch(uri) - } + rememberLauncherForActivityResult( + contract = ActivityResultContracts.RequestPermission(), + ) { isGranted -> + if (isGranted) { + // Create image file for camera + val imageFile = createImageFile(context) + val uri = + FileProvider.getUriForFile( + context, + "${context.packageName}.fileprovider", + imageFile, + ) + cameraImageUri = uri + cameraLauncher.launch(uri) } + } Column(modifier = modifier) { Row( - modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.SpaceBetween, - verticalAlignment = Alignment.CenterVertically + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically, ) { Text( - text = "Photos (${tempImageUris.size}/$maxImages)", - style = MaterialTheme.typography.titleMedium + text = "Photos (${tempImageUris.size}/$maxImages)", + style = MaterialTheme.typography.titleMedium, ) if (tempImageUris.size < maxImages) { TextButton(onClick = { showImageSourceDialog = true }) { Icon( - Icons.Default.Add, - contentDescription = null, - modifier = Modifier.size(16.dp) + Icons.Default.Add, + contentDescription = null, + modifier = Modifier.size(16.dp), ) Spacer(modifier = Modifier.width(4.dp)) Text("Add Photos") @@ -134,42 +134,42 @@ fun ImagePicker( LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) { items(tempImageUris) { imagePath -> ImageItem( - imagePath = imagePath, - onRemove = { - val updatedUris = tempImageUris.filter { it != imagePath } - tempImageUris = updatedUris - onImagesChanged(updatedUris) + imagePath = imagePath, + onRemove = { + val updatedUris = tempImageUris.filter { it != imagePath } + tempImageUris = updatedUris + onImagesChanged(updatedUris) - // Delete the image file - ImageUtils.deleteImage(context, imagePath) - } + // Delete the image file + ImageUtils.deleteImage(context, imagePath) + }, ) } } } else { Spacer(modifier = Modifier.height(8.dp)) Card( - modifier = Modifier.fillMaxWidth().height(100.dp), - colors = - CardDefaults.cardColors( - containerColor = - MaterialTheme.colorScheme.surfaceVariant.copy( - alpha = 0.3f - ) - ) + modifier = Modifier.fillMaxWidth().height(100.dp), + colors = + CardDefaults.cardColors( + containerColor = + MaterialTheme.colorScheme.surfaceVariant.copy( + alpha = 0.3f, + ), + ), ) { Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { Column(horizontalAlignment = Alignment.CenterHorizontally) { Icon( - Icons.Default.Add, - contentDescription = null, - tint = MaterialTheme.colorScheme.onSurfaceVariant + Icons.Default.Add, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant, ) Spacer(modifier = Modifier.height(4.dp)) Text( - text = "Add photos of this problem", - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant + text = "Add photos of this problem", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } } @@ -179,67 +179,68 @@ fun ImagePicker( // Image Source Selection Dialog if (showImageSourceDialog) { AlertDialog( - onDismissRequest = { showImageSourceDialog = false }, - title = { Text("Add Photo") }, - text = { Text("Choose how you'd like to add a photo") }, - confirmButton = { - Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { - TextButton( - onClick = { - showImageSourceDialog = false - imagePickerLauncher.launch("image/*") - } - ) { - Icon( - Icons.Default.PhotoLibrary, - contentDescription = null, - modifier = Modifier.size(16.dp) - ) - Spacer(modifier = Modifier.width(4.dp)) - Text("Gallery") - } - - TextButton( - onClick = { - showImageSourceDialog = false - when (ContextCompat.checkSelfPermission( - context, - Manifest.permission.CAMERA - ) - ) { - PackageManager.PERMISSION_GRANTED -> { - // Create image file for camera - val imageFile = createImageFile(context) - val uri = - FileProvider.getUriForFile( - context, - "${context.packageName}.fileprovider", - imageFile - ) - cameraImageUri = uri - cameraLauncher.launch(uri) - } - else -> { - cameraPermissionLauncher.launch( - Manifest.permission.CAMERA - ) - } - } - } - ) { - Icon( - Icons.Default.CameraAlt, - contentDescription = null, - modifier = Modifier.size(16.dp) - ) - Spacer(modifier = Modifier.width(4.dp)) - Text("Camera") - } + onDismissRequest = { showImageSourceDialog = false }, + title = { Text("Add Photo") }, + text = { Text("Choose how you'd like to add a photo") }, + confirmButton = { + Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { + TextButton( + onClick = { + showImageSourceDialog = false + imagePickerLauncher.launch("image/*") + }, + ) { + Icon( + Icons.Default.PhotoLibrary, + contentDescription = null, + modifier = Modifier.size(16.dp), + ) + Spacer(modifier = Modifier.width(4.dp)) + Text("Gallery") + } + + TextButton( + onClick = { + showImageSourceDialog = false + when ( + ContextCompat.checkSelfPermission( + context, + Manifest.permission.CAMERA, + ) + ) { + PackageManager.PERMISSION_GRANTED -> { + // Create image file for camera + val imageFile = createImageFile(context) + val uri = + FileProvider.getUriForFile( + context, + "${context.packageName}.fileprovider", + imageFile, + ) + cameraImageUri = uri + cameraLauncher.launch(uri) + } + else -> { + cameraPermissionLauncher.launch( + Manifest.permission.CAMERA, + ) + } + } + }, + ) { + Icon( + Icons.Default.CameraAlt, + contentDescription = null, + modifier = Modifier.size(16.dp), + ) + Spacer(modifier = Modifier.width(4.dp)) + Text("Camera") } - }, - dismissButton = { - TextButton(onClick = { showImageSourceDialog = false }) { Text("Cancel") } } + }, + dismissButton = { + TextButton(onClick = { showImageSourceDialog = false }) { Text("Cancel") } + }, ) } } @@ -259,25 +260,25 @@ private fun ImageItem(imagePath: String, onRemove: () -> Unit, modifier: Modifie Box(modifier = modifier.size(80.dp)) { OrientationAwareImage( - imagePath = imagePath, - contentDescription = "Problem photo", - modifier = Modifier.fillMaxSize().clip(RoundedCornerShape(8.dp)), - contentScale = ContentScale.Crop + imagePath = imagePath, + contentDescription = "Problem photo", + modifier = Modifier.fillMaxSize().clip(RoundedCornerShape(8.dp)), + contentScale = ContentScale.Crop, ) IconButton(onClick = onRemove, modifier = Modifier.align(Alignment.TopEnd).size(24.dp)) { Card( - shape = RoundedCornerShape(12.dp), - colors = - CardDefaults.cardColors( - containerColor = MaterialTheme.colorScheme.errorContainer - ) + shape = RoundedCornerShape(12.dp), + colors = + CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.errorContainer, + ), ) { Icon( - Icons.Default.Close, - contentDescription = "Remove photo", - modifier = Modifier.fillMaxSize().padding(2.dp), - tint = MaterialTheme.colorScheme.onErrorContainer + Icons.Default.Close, + contentDescription = "Remove photo", + modifier = Modifier.fillMaxSize().padding(2.dp), + tint = MaterialTheme.colorScheme.onErrorContainer, ) } } diff --git a/android/app/src/main/java/com/atridad/ascently/ui/components/LineChart.kt b/android/app/src/main/java/com/atridad/ascently/ui/components/LineChart.kt index c508b29..86f988b 100644 --- a/android/app/src/main/java/com/atridad/ascently/ui/components/LineChart.kt +++ b/android/app/src/main/java/com/atridad/ascently/ui/components/LineChart.kt @@ -25,7 +25,7 @@ import androidx.compose.ui.unit.sp data class ChartDataPoint( val x: Float, val y: Float, - val label: String? = null + val label: String? = null, ) /** @@ -37,7 +37,7 @@ data class ChartStyle( val lineWidth: Float = 3f, val gridColor: Color, val textColor: Color, - val backgroundColor: Color + val backgroundColor: Color, ) /** @@ -52,59 +52,59 @@ fun LineChart( fillColor = MaterialTheme.colorScheme.primary.copy(alpha = 0.2f), gridColor = MaterialTheme.colorScheme.outline.copy(alpha = 0.3f), textColor = MaterialTheme.colorScheme.onSurfaceVariant, - backgroundColor = MaterialTheme.colorScheme.surface + backgroundColor = MaterialTheme.colorScheme.surface, ), showGrid: Boolean = true, xAxisFormatter: (Float) -> String = { it.toString() }, - yAxisFormatter: (Float) -> String = { it.toString() } + yAxisFormatter: (Float) -> String = { it.toString() }, ) { val textMeasurer = rememberTextMeasurer() val density = LocalDensity.current - + Box(modifier = modifier) { Canvas( modifier = Modifier .fillMaxSize() - .padding(16.dp) + .padding(16.dp), ) { if (data.isEmpty()) return@Canvas - + val padding = with(density) { 32.dp.toPx() } val chartWidth = size.width - padding * 2 val chartHeight = size.height - padding * 2 - + // Calculate data bounds val dataMinY = data.minOf { it.y } val dataMaxY = data.maxOf { it.y } - + // Add some padding to Y-axis (10% above and below the data range) val yPadding = if (dataMaxY == dataMinY) 1f else (dataMaxY - dataMinY) * 0.1f val minY = dataMinY - yPadding val maxY = dataMaxY + yPadding - + val minX = data.minOf { it.x } val maxX = data.maxOf { it.x } - + val xRange = if (maxX - minX == 0f) 1f else maxX - minX // Minimum range of 1 for single points val yRange = maxY - minY - + // Ensure we have valid ranges if (yRange == 0f) return@Canvas - + // Convert data points to screen coordinates val screenPoints = data.map { point -> val x = padding + (point.x - minX) / xRange * chartWidth val y = padding + chartHeight - (point.y - minY) / yRange * chartHeight Offset(x, y) } - + // Draw background drawRect( color = style.backgroundColor, topLeft = Offset(padding, padding), - size = androidx.compose.ui.geometry.Size(chartWidth, chartHeight) + size = androidx.compose.ui.geometry.Size(chartWidth, chartHeight), ) - + // Draw grid if (showGrid) { drawGrid( @@ -120,49 +120,49 @@ fun LineChart( textColor = style.textColor, xAxisFormatter = xAxisFormatter, yAxisFormatter = yAxisFormatter, - actualDataPoints = data + actualDataPoints = data, ) } - + // Draw area fill if (screenPoints.size > 1) { drawAreaFill( points = screenPoints, padding = padding, chartHeight = chartHeight, - fillColor = style.fillColor + fillColor = style.fillColor, ) } - + // Draw line if (screenPoints.size > 1) { drawLine( points = screenPoints, lineColor = style.lineColor, - lineWidth = style.lineWidth + lineWidth = style.lineWidth, ) } - + // Draw data points - more pronounced screenPoints.forEach { point -> // Draw outer circle (larger) drawCircle( color = style.lineColor, radius = 8f, - center = point + center = point, ) // Draw inner circle (white center) drawCircle( color = style.backgroundColor, radius = 5f, - center = point + center = point, ) // Draw border for better visibility drawCircle( color = style.lineColor, radius = 8f, center = point, - style = Stroke(width = 2f) + style = Stroke(width = 2f), ) } } @@ -182,43 +182,43 @@ private fun DrawScope.drawGrid( textColor: Color, xAxisFormatter: (Float) -> String, yAxisFormatter: (Float) -> String, - actualDataPoints: List + actualDataPoints: List, ) { val textStyle = TextStyle( color = textColor, - fontSize = 10.sp + fontSize = 10.sp, ) - + // Draw vertical grid lines (X-axis) - only at integer values for sessions val xRange = maxX - minX if (xRange > 0) { val startX = kotlin.math.ceil(minX).toInt() val endX = kotlin.math.floor(maxX).toInt() - + for (sessionNum in startX..endX) { val x = padding + (sessionNum.toFloat() - minX) / xRange * chartWidth - + // Draw grid line drawLine( color = gridColor, start = Offset(x, padding), end = Offset(x, padding + chartHeight), - strokeWidth = 1.dp.toPx() + strokeWidth = 1.dp.toPx(), ) - + // X-axis labels removed per user request } } - + // Draw horizontal grid lines (Y-axis) - only at actual data point values val yRange = maxY - minY if (yRange > 0) { // Get unique Y values from actual data points val actualYValues = actualDataPoints.map { kotlin.math.round(it.y).toInt() }.toSet() - + actualYValues.forEach { gradeValue -> val y = padding + chartHeight - (gradeValue.toFloat() - minY) / yRange * chartHeight - + // Only draw if within chart bounds if (y >= padding && y <= padding + chartHeight) { // Draw grid line @@ -226,9 +226,9 @@ private fun DrawScope.drawGrid( color = gridColor, start = Offset(padding, y), end = Offset(padding + chartWidth, y), - strokeWidth = 1.dp.toPx() + strokeWidth = 1.dp.toPx(), ) - + // Draw label val text = yAxisFormatter(gradeValue.toFloat()) val textSize = textMeasurer.measure(text, textStyle) @@ -238,8 +238,8 @@ private fun DrawScope.drawGrid( style = textStyle, topLeft = Offset( padding - textSize.size.width - 8.dp.toPx(), - y - textSize.size.height / 2f - ) + y - textSize.size.height / 2f, + ), ) } } @@ -250,38 +250,38 @@ private fun DrawScope.drawAreaFill( points: List, padding: Float, chartHeight: Float, - fillColor: Color + fillColor: Color, ) { val bottomY = padding + chartHeight // This represents the bottom of the chart area - + val path = Path().apply { // Start from bottom-left (at chart bottom level) moveTo(points.first().x, bottomY) - + // Draw to first point lineTo(points.first().x, points.first().y) - + // Draw line through all points for (i in 1 until points.size) { lineTo(points[i].x, points[i].y) } - + // Close the path by going to bottom-right (at chart bottom level) and back to start lineTo(points.last().x, bottomY) lineTo(points.first().x, bottomY) close() } - + drawPath( path = path, - color = fillColor + color = fillColor, ) } private fun DrawScope.drawLine( points: List, lineColor: Color, - lineWidth: Float + lineWidth: Float, ) { val path = Path().apply { moveTo(points.first().x, points.first().y) @@ -289,14 +289,14 @@ private fun DrawScope.drawLine( lineTo(points[i].x, points[i].y) } } - + drawPath( path = path, color = lineColor, style = Stroke( width = lineWidth, cap = StrokeCap.Round, - join = StrokeJoin.Round - ) + join = StrokeJoin.Round, + ), ) } diff --git a/android/app/src/main/java/com/atridad/ascently/ui/components/NotificationPermissionDialog.kt b/android/app/src/main/java/com/atridad/ascently/ui/components/NotificationPermissionDialog.kt index 5d3f961..96adaa5 100644 --- a/android/app/src/main/java/com/atridad/ascently/ui/components/NotificationPermissionDialog.kt +++ b/android/app/src/main/java/com/atridad/ascently/ui/components/NotificationPermissionDialog.kt @@ -15,59 +15,59 @@ import androidx.compose.ui.window.DialogProperties @Composable fun NotificationPermissionDialog(onDismiss: () -> Unit, onRequestPermission: () -> Unit) { Dialog( - onDismissRequest = onDismiss, - properties = DialogProperties(dismissOnBackPress = false, dismissOnClickOutside = false) + onDismissRequest = onDismiss, + properties = DialogProperties(dismissOnBackPress = false, dismissOnClickOutside = false), ) { Card( - modifier = Modifier.fillMaxWidth().padding(16.dp), - shape = MaterialTheme.shapes.medium + modifier = Modifier.fillMaxWidth().padding(16.dp), + shape = MaterialTheme.shapes.medium, ) { Column( - modifier = Modifier.padding(24.dp), - horizontalAlignment = Alignment.CenterHorizontally + modifier = Modifier.padding(24.dp), + horizontalAlignment = Alignment.CenterHorizontally, ) { Icon( - imageVector = Icons.Default.Notifications, - contentDescription = "Notifications", - modifier = Modifier.size(48.dp), - tint = MaterialTheme.colorScheme.primary + imageVector = Icons.Default.Notifications, + contentDescription = "Notifications", + modifier = Modifier.size(48.dp), + tint = MaterialTheme.colorScheme.primary, ) Spacer(modifier = Modifier.height(16.dp)) Text( - text = "Enable Notifications", - style = MaterialTheme.typography.headlineSmall, - fontWeight = MaterialTheme.typography.headlineSmall.fontWeight, - textAlign = TextAlign.Center + text = "Enable Notifications", + style = MaterialTheme.typography.headlineSmall, + fontWeight = MaterialTheme.typography.headlineSmall.fontWeight, + textAlign = TextAlign.Center, ) Spacer(modifier = Modifier.height(12.dp)) Text( - text = - "Ascently needs notification permission to show your active climbing session. This helps you track your progress and ensures the session doesn't get interrupted.", - style = MaterialTheme.typography.bodyMedium, - textAlign = TextAlign.Center, - color = MaterialTheme.colorScheme.onSurfaceVariant + text = + "Ascently needs notification permission to show your active climbing session. This helps you track your progress and ensures the session doesn't get interrupted.", + style = MaterialTheme.typography.bodyMedium, + textAlign = TextAlign.Center, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) Spacer(modifier = Modifier.height(24.dp)) Row( - modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.spacedBy(12.dp) + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(12.dp), ) { TextButton(onClick = onDismiss, modifier = Modifier.weight(1f)) { Text("Not Now") } Button( - onClick = { - onRequestPermission() - onDismiss() - }, - modifier = Modifier.weight(1f) + onClick = { + onRequestPermission() + onDismiss() + }, + modifier = Modifier.weight(1f), ) { Text("Enable") } } } diff --git a/android/app/src/main/java/com/atridad/ascently/ui/components/OrientationAwareImage.kt b/android/app/src/main/java/com/atridad/ascently/ui/components/OrientationAwareImage.kt index 85c6a8b..f60c743 100644 --- a/android/app/src/main/java/com/atridad/ascently/ui/components/OrientationAwareImage.kt +++ b/android/app/src/main/java/com/atridad/ascently/ui/components/OrientationAwareImage.kt @@ -16,39 +16,39 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.dp import androidx.exifinterface.media.ExifInterface import com.atridad.ascently.utils.ImageUtils -import java.io.File import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext +import java.io.File @Composable fun OrientationAwareImage( - imagePath: String, - modifier: Modifier = Modifier, - contentDescription: String? = null, - contentScale: ContentScale = ContentScale.Fit + imagePath: String, + modifier: Modifier = Modifier, + contentDescription: String? = null, + contentScale: ContentScale = ContentScale.Fit, ) { val context = LocalContext.current var imageBitmap by - remember(imagePath) { mutableStateOf(null) } + remember(imagePath) { mutableStateOf(null) } var isLoading by remember(imagePath) { mutableStateOf(true) } LaunchedEffect(imagePath) { isLoading = true val bitmap = - withContext(Dispatchers.IO) { - try { - val imageFile = ImageUtils.getImageFile(context, imagePath) - if (!imageFile.exists()) return@withContext null + withContext(Dispatchers.IO) { + try { + val imageFile = ImageUtils.getImageFile(context, imagePath) + if (!imageFile.exists()) return@withContext null - val originalBitmap = - BitmapFactory.decodeFile(imageFile.absolutePath) - ?: return@withContext null - val correctedBitmap = correctImageOrientation(imageFile, originalBitmap) - correctedBitmap.asImageBitmap() - } catch (_: Exception) { - null - } + val originalBitmap = + BitmapFactory.decodeFile(imageFile.absolutePath) + ?: return@withContext null + val correctedBitmap = correctImageOrientation(imageFile, originalBitmap) + correctedBitmap.asImageBitmap() + } catch (_: Exception) { + null } + } imageBitmap = bitmap isLoading = false } @@ -59,10 +59,10 @@ fun OrientationAwareImage( } else { imageBitmap?.let { bitmap -> Image( - bitmap = bitmap, - contentDescription = contentDescription, - modifier = Modifier.fillMaxSize(), - contentScale = contentScale + bitmap = bitmap, + contentDescription = contentDescription, + modifier = Modifier.fillMaxSize(), + contentScale = contentScale, ) } } @@ -70,16 +70,16 @@ fun OrientationAwareImage( } private fun correctImageOrientation( - imageFile: File, - bitmap: android.graphics.Bitmap + imageFile: File, + bitmap: android.graphics.Bitmap, ): android.graphics.Bitmap { return try { val exif = ExifInterface(imageFile.absolutePath) val orientation = - exif.getAttributeInt( - ExifInterface.TAG_ORIENTATION, - ExifInterface.ORIENTATION_NORMAL - ) + exif.getAttributeInt( + ExifInterface.TAG_ORIENTATION, + ExifInterface.ORIENTATION_NORMAL, + ) val matrix = Matrix() var needsTransform = false @@ -124,15 +124,15 @@ private fun correctImageOrientation( bitmap } else { val rotatedBitmap = - android.graphics.Bitmap.createBitmap( - bitmap, - 0, - 0, - bitmap.width, - bitmap.height, - matrix, - true - ) + android.graphics.Bitmap.createBitmap( + bitmap, + 0, + 0, + bitmap.width, + bitmap.height, + matrix, + true, + ) if (rotatedBitmap != bitmap) { bitmap.recycle() } diff --git a/android/app/src/main/java/com/atridad/ascently/ui/components/SyncIndicator.kt b/android/app/src/main/java/com/atridad/ascently/ui/components/SyncIndicator.kt index f84bc0e..9b2ac73 100644 --- a/android/app/src/main/java/com/atridad/ascently/ui/components/SyncIndicator.kt +++ b/android/app/src/main/java/com/atridad/ascently/ui/components/SyncIndicator.kt @@ -26,23 +26,23 @@ fun SyncIndicator(isSyncing: StateFlow, modifier: Modifier = Modifier) val syncing by isSyncing.collectAsState() AnimatedVisibility( - visible = syncing, - enter = scaleIn() + fadeIn(), - exit = scaleOut() + fadeOut(), - modifier = modifier + visible = syncing, + enter = scaleIn() + fadeIn(), + exit = scaleOut() + fadeOut(), + modifier = modifier, ) { Box( - modifier = - Modifier.size(28.dp) - .clip(CircleShape) - .background(MaterialTheme.colorScheme.primaryContainer, CircleShape) - .padding(6.dp), - contentAlignment = Alignment.Center + modifier = + Modifier.size(28.dp) + .clip(CircleShape) + .background(MaterialTheme.colorScheme.primaryContainer, CircleShape) + .padding(6.dp), + contentAlignment = Alignment.Center, ) { CircularProgressIndicator( - modifier = Modifier.size(16.dp), - strokeWidth = 2.dp, - color = MaterialTheme.colorScheme.primary + modifier = Modifier.size(16.dp), + strokeWidth = 2.dp, + color = MaterialTheme.colorScheme.primary, ) } } diff --git a/android/app/src/main/java/com/atridad/ascently/ui/health/HealthConnectCard.kt b/android/app/src/main/java/com/atridad/ascently/ui/health/HealthConnectCard.kt index ecc27da..8773afb 100644 --- a/android/app/src/main/java/com/atridad/ascently/ui/health/HealthConnectCard.kt +++ b/android/app/src/main/java/com/atridad/ascently/ui/health/HealthConnectCard.kt @@ -36,19 +36,19 @@ fun HealthConnectCard(modifier: Modifier = Modifier) { // Permission launcher val permissionLauncher = - rememberLauncherForActivityResult( - contract = healthConnectManager.getPermissionRequestContract() - ) { _ -> - coroutineScope.launch { - val allGranted = healthConnectManager.hasAllPermissions() - if (!allGranted) { - errorMessage = - "Some Health Connect permissions were not granted. Please grant all permissions to enable syncing." - } else { - errorMessage = null - } + rememberLauncherForActivityResult( + contract = healthConnectManager.getPermissionRequestContract(), + ) { _ -> + coroutineScope.launch { + val allGranted = healthConnectManager.hasAllPermissions() + if (!allGranted) { + errorMessage = + "Some Health Connect permissions were not granted. Please grant all permissions to enable syncing." + } else { + errorMessage = null } } + } // Check Health Connect availability on first load LaunchedEffect(Unit) { @@ -62,7 +62,7 @@ fun HealthConnectCard(modifier: Modifier = Modifier) { errorMessage = "Health Connect is not available on this device" } else if (!isCompatible) { errorMessage = - "Health Connect API compatibility issue. Please update your device or the app." + "Health Connect API compatibility issue. Please update your device or the app." } } } catch (e: Exception) { @@ -73,32 +73,32 @@ fun HealthConnectCard(modifier: Modifier = Modifier) { } Card( - modifier = modifier.fillMaxWidth(), - shape = RoundedCornerShape(16.dp), - colors = - CardDefaults.cardColors( - containerColor = MaterialTheme.colorScheme.surfaceVariant - ) + modifier = modifier.fillMaxWidth(), + shape = RoundedCornerShape(16.dp), + colors = + CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.surfaceVariant, + ), ) { Column( - modifier = Modifier.fillMaxWidth().padding(20.dp), - horizontalAlignment = Alignment.CenterHorizontally + modifier = Modifier.fillMaxWidth().padding(20.dp), + horizontalAlignment = Alignment.CenterHorizontally, ) { // Header with icon and title Row( modifier = Modifier.fillMaxWidth(), - verticalAlignment = Alignment.CenterVertically + verticalAlignment = Alignment.CenterVertically, ) { Icon( imageVector = Icons.Default.HealthAndSafety, contentDescription = null, modifier = Modifier.size(32.dp), tint = - if (isHealthConnectAvailable && isEnabled && hasPermissions) { - MaterialTheme.colorScheme.primary - } else { - MaterialTheme.colorScheme.onSurfaceVariant - } + if (isHealthConnectAvailable && isEnabled && hasPermissions) { + MaterialTheme.colorScheme.primary + } else { + MaterialTheme.colorScheme.onSurfaceVariant + }, ) Spacer(modifier = Modifier.width(12.dp)) @@ -108,40 +108,40 @@ fun HealthConnectCard(modifier: Modifier = Modifier) { text = "Health Connect", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold, - color = MaterialTheme.colorScheme.onSurfaceVariant + color = MaterialTheme.colorScheme.onSurfaceVariant, ) Text( text = - when { - isLoading -> "Checking availability..." - !isCompatible -> "API Issue" - !isHealthConnectAvailable -> "Not available" - isEnabled && hasPermissions -> "Connected" - isEnabled && !hasPermissions -> "Needs permissions" - else -> "Disabled" - }, + when { + isLoading -> "Checking availability..." + !isCompatible -> "API Issue" + !isHealthConnectAvailable -> "Not available" + isEnabled && hasPermissions -> "Connected" + isEnabled && !hasPermissions -> "Needs permissions" + else -> "Disabled" + }, style = MaterialTheme.typography.bodySmall, color = - when { - isLoading -> - MaterialTheme.colorScheme.onSurfaceVariant.copy( - alpha = 0.7f - ) + when { + isLoading -> + MaterialTheme.colorScheme.onSurfaceVariant.copy( + alpha = 0.7f, + ) - !isCompatible -> MaterialTheme.colorScheme.error - !isHealthConnectAvailable -> MaterialTheme.colorScheme.error - isEnabled && hasPermissions -> - MaterialTheme.colorScheme.primary + !isCompatible -> MaterialTheme.colorScheme.error + !isHealthConnectAvailable -> MaterialTheme.colorScheme.error + isEnabled && hasPermissions -> + MaterialTheme.colorScheme.primary - isEnabled && !hasPermissions -> - MaterialTheme.colorScheme.tertiary + isEnabled && !hasPermissions -> + MaterialTheme.colorScheme.tertiary - else -> - MaterialTheme.colorScheme.onSurfaceVariant.copy( - alpha = 0.7f - ) - } + else -> + MaterialTheme.colorScheme.onSurfaceVariant.copy( + alpha = 0.7f, + ) + }, ) } @@ -167,7 +167,7 @@ fun HealthConnectCard(modifier: Modifier = Modifier) { } } }, - enabled = isHealthConnectAvailable && !isLoading && isCompatible + enabled = isHealthConnectAvailable && !isLoading && isCompatible, ) } @@ -179,7 +179,7 @@ fun HealthConnectCard(modifier: Modifier = Modifier) { style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurfaceVariant, textAlign = TextAlign.Center, - modifier = Modifier.fillMaxWidth() + modifier = Modifier.fillMaxWidth(), ) if (!hasPermissions) { @@ -187,12 +187,12 @@ fun HealthConnectCard(modifier: Modifier = Modifier) { Card( shape = RoundedCornerShape(12.dp), colors = - CardDefaults.cardColors( - containerColor = - MaterialTheme.colorScheme.errorContainer.copy( - alpha = 0.3f - ) - ) + CardDefaults.cardColors( + containerColor = + MaterialTheme.colorScheme.errorContainer.copy( + alpha = 0.3f, + ), + ), ) { Column(modifier = Modifier.fillMaxWidth().padding(16.dp)) { Row(verticalAlignment = Alignment.CenterVertically) { @@ -200,7 +200,7 @@ fun HealthConnectCard(modifier: Modifier = Modifier) { imageVector = Icons.Default.Warning, contentDescription = null, modifier = Modifier.size(20.dp), - tint = MaterialTheme.colorScheme.error + tint = MaterialTheme.colorScheme.error, ) Spacer(modifier = Modifier.width(8.dp)) @@ -209,7 +209,7 @@ fun HealthConnectCard(modifier: Modifier = Modifier) { text = "Permissions needed", style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.Medium, - color = MaterialTheme.colorScheme.onSurfaceVariant + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } @@ -217,12 +217,12 @@ fun HealthConnectCard(modifier: Modifier = Modifier) { Text( text = - "Grant Health Connect permissions to sync your climbing sessions", + "Grant Health Connect permissions to sync your climbing sessions", style = MaterialTheme.typography.bodySmall, color = - MaterialTheme.colorScheme.onSurfaceVariant.copy( - alpha = 0.8f - ) + MaterialTheme.colorScheme.onSurfaceVariant.copy( + alpha = 0.8f, + ), ) Spacer(modifier = Modifier.height(8.dp)) @@ -243,7 +243,7 @@ fun HealthConnectCard(modifier: Modifier = Modifier) { } } }, - modifier = Modifier.fillMaxWidth() + modifier = Modifier.fillMaxWidth(), ) { Text("Grant Permissions") } } } @@ -251,10 +251,10 @@ fun HealthConnectCard(modifier: Modifier = Modifier) { Spacer(modifier = Modifier.height(16.dp)) Text( text = - "Sync your climbing sessions to Samsung Health, Google Fit, and other fitness apps through Health Connect.", + "Sync your climbing sessions to Samsung Health, Google Fit, and other fitness apps through Health Connect.", style = MaterialTheme.typography.bodyMedium, textAlign = TextAlign.Center, - color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.8f) + color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.8f), ) } errorMessage?.let { error -> @@ -263,22 +263,22 @@ fun HealthConnectCard(modifier: Modifier = Modifier) { Card( shape = RoundedCornerShape(8.dp), colors = - CardDefaults.cardColors( - containerColor = - MaterialTheme.colorScheme.errorContainer.copy( - alpha = 0.5f - ) - ) + CardDefaults.cardColors( + containerColor = + MaterialTheme.colorScheme.errorContainer.copy( + alpha = 0.5f, + ), + ), ) { Row( modifier = Modifier.fillMaxWidth().padding(12.dp), - verticalAlignment = Alignment.CenterVertically + verticalAlignment = Alignment.CenterVertically, ) { Icon( imageVector = Icons.Default.Warning, contentDescription = null, modifier = Modifier.size(16.dp), - tint = MaterialTheme.colorScheme.error + tint = MaterialTheme.colorScheme.error, ) Spacer(modifier = Modifier.width(8.dp)) @@ -286,7 +286,7 @@ fun HealthConnectCard(modifier: Modifier = Modifier) { Text( text = error, style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onErrorContainer + color = MaterialTheme.colorScheme.onErrorContainer, ) } } diff --git a/android/app/src/main/java/com/atridad/ascently/ui/screens/AddEditScreens.kt b/android/app/src/main/java/com/atridad/ascently/ui/screens/AddEditScreens.kt index 8ee6f88..fef692d 100644 --- a/android/app/src/main/java/com/atridad/ascently/ui/screens/AddEditScreens.kt +++ b/android/app/src/main/java/com/atridad/ascently/ui/screens/AddEditScreens.kt @@ -20,8 +20,8 @@ import androidx.compose.ui.unit.dp import com.atridad.ascently.data.model.* import com.atridad.ascently.ui.components.ImagePicker import com.atridad.ascently.ui.viewmodel.ClimbViewModel -import java.time.LocalDateTime import kotlinx.coroutines.flow.first +import java.time.LocalDateTime @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -36,18 +36,18 @@ fun AddEditGymScreen(gymId: String?, viewModel: ClimbViewModel, onNavigateBack: // Calculate available difficulty systems based on selected climb types val availableDifficultySystems = - if (selectedClimbTypes.isEmpty()) { - emptyList() - } else { - selectedClimbTypes - .flatMap { climbType -> DifficultySystem.systemsForClimbType(climbType) } - .distinct() - } + if (selectedClimbTypes.isEmpty()) { + emptyList() + } else { + selectedClimbTypes + .flatMap { climbType -> DifficultySystem.systemsForClimbType(climbType) } + .distinct() + } // Reset selected difficulty systems when available systems change LaunchedEffect(availableDifficultySystems) { selectedDifficultySystems = - selectedDifficultySystems.filter { it in availableDifficultySystems }.toSet() + selectedDifficultySystems.filter { it in availableDifficultySystems }.toSet() } // Load existing gym data for editing @@ -65,103 +65,103 @@ fun AddEditGymScreen(gymId: String?, viewModel: ClimbViewModel, onNavigateBack: } Scaffold( - topBar = { - TopAppBar( - title = { Text(if (isEditing) "Edit Gym" else "Add Gym") }, - navigationIcon = { - IconButton(onClick = onNavigateBack) { - Icon( - Icons.AutoMirrored.Filled.ArrowBack, - contentDescription = "Back" + topBar = { + TopAppBar( + title = { Text(if (isEditing) "Edit Gym" else "Add Gym") }, + navigationIcon = { + IconButton(onClick = onNavigateBack) { + Icon( + Icons.AutoMirrored.Filled.ArrowBack, + contentDescription = "Back", + ) + } + }, + actions = { + TextButton( + onClick = { + val gym = + Gym.create( + name, + location, + selectedClimbTypes.toList(), + selectedDifficultySystems.toList(), + notes = notes, ) - } - }, - actions = { - TextButton( - onClick = { - val gym = - Gym.create( - name, - location, - selectedClimbTypes.toList(), - selectedDifficultySystems.toList(), - notes = notes - ) - if (isEditing) { - viewModel.updateGym(gym.copy(id = gymId)) - } else { - viewModel.addGym(gym) - } - onNavigateBack() - }, - enabled = - name.isNotBlank() && - selectedClimbTypes.isNotEmpty() && - selectedDifficultySystems.isNotEmpty() - ) { Text("Save") } - } - ) - } + if (isEditing) { + viewModel.updateGym(gym.copy(id = gymId)) + } else { + viewModel.addGym(gym) + } + onNavigateBack() + }, + enabled = + name.isNotBlank() && + selectedClimbTypes.isNotEmpty() && + selectedDifficultySystems.isNotEmpty(), + ) { Text("Save") } + }, + ) + }, ) { paddingValues -> Column( - modifier = Modifier.fillMaxSize().padding(paddingValues).padding(16.dp), - verticalArrangement = Arrangement.spacedBy(16.dp) + modifier = Modifier.fillMaxSize().padding(paddingValues).padding(16.dp), + verticalArrangement = Arrangement.spacedBy(16.dp), ) { // Name field OutlinedTextField( - value = name, - onValueChange = { name = it }, - label = { Text("Gym Name") }, - modifier = Modifier.fillMaxWidth(), - singleLine = true + value = name, + onValueChange = { name = it }, + label = { Text("Gym Name") }, + modifier = Modifier.fillMaxWidth(), + singleLine = true, ) // Location field OutlinedTextField( - value = location, - onValueChange = { location = it }, - label = { Text("Location (Optional)") }, - modifier = Modifier.fillMaxWidth(), - singleLine = true + value = location, + onValueChange = { location = it }, + label = { Text("Location (Optional)") }, + modifier = Modifier.fillMaxWidth(), + singleLine = true, ) // Climb Types Card(modifier = Modifier.fillMaxWidth()) { Column(modifier = Modifier.padding(16.dp)) { Text( - text = "Supported Climb Types", - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.Bold + text = "Supported Climb Types", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold, ) Spacer(modifier = Modifier.height(8.dp)) ClimbType.entries.forEach { climbType -> Row( - verticalAlignment = Alignment.CenterVertically, - modifier = - Modifier.fillMaxWidth() - .selectable( - selected = climbType in selectedClimbTypes, - onClick = { - selectedClimbTypes = - if (climbType in - selectedClimbTypes - ) { - selectedClimbTypes - - climbType - } else { - selectedClimbTypes + - climbType - } - }, - role = Role.Checkbox - ) + verticalAlignment = Alignment.CenterVertically, + modifier = + Modifier.fillMaxWidth() + .selectable( + selected = climbType in selectedClimbTypes, + onClick = { + selectedClimbTypes = + if (climbType in + selectedClimbTypes + ) { + selectedClimbTypes - + climbType + } else { + selectedClimbTypes + + climbType + } + }, + role = Role.Checkbox, + ), ) { Checkbox( - checked = climbType in selectedClimbTypes, - onCheckedChange = null + checked = climbType in selectedClimbTypes, + onCheckedChange = null, ) Spacer(modifier = Modifier.width(8.dp)) Text(climbType.displayName) @@ -174,49 +174,49 @@ fun AddEditGymScreen(gymId: String?, viewModel: ClimbViewModel, onNavigateBack: Card(modifier = Modifier.fillMaxWidth()) { Column(modifier = Modifier.padding(16.dp)) { Text( - text = "Difficulty Systems", - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.Bold + text = "Difficulty Systems", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold, ) Spacer(modifier = Modifier.height(8.dp)) if (selectedClimbTypes.isEmpty()) { Text( - text = - "Select climb types first to see available difficulty systems", - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - modifier = Modifier.padding(vertical = 8.dp) + text = + "Select climb types first to see available difficulty systems", + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.padding(vertical = 8.dp), ) } else { availableDifficultySystems.forEach { system -> Row( - verticalAlignment = Alignment.CenterVertically, - modifier = - Modifier.fillMaxWidth() - .selectable( - selected = - system in - selectedDifficultySystems, - onClick = { - selectedDifficultySystems = - if (system in - selectedDifficultySystems - ) { - selectedDifficultySystems - - system - } else { - selectedDifficultySystems + - system - } - }, - role = Role.Checkbox - ) + verticalAlignment = Alignment.CenterVertically, + modifier = + Modifier.fillMaxWidth() + .selectable( + selected = + system in + selectedDifficultySystems, + onClick = { + selectedDifficultySystems = + if (system in + selectedDifficultySystems + ) { + selectedDifficultySystems - + system + } else { + selectedDifficultySystems + + system + } + }, + role = Role.Checkbox, + ), ) { Checkbox( - checked = system in selectedDifficultySystems, - onCheckedChange = null + checked = system in selectedDifficultySystems, + onCheckedChange = null, ) Spacer(modifier = Modifier.width(8.dp)) Text(system.displayName) @@ -228,11 +228,11 @@ fun AddEditGymScreen(gymId: String?, viewModel: ClimbViewModel, onNavigateBack: // Notes field OutlinedTextField( - value = notes, - onValueChange = { notes = it }, - label = { Text("Notes (Optional)") }, - modifier = Modifier.fillMaxWidth(), - minLines = 3 + value = notes, + onValueChange = { notes = it }, + label = { Text("Notes (Optional)") }, + modifier = Modifier.fillMaxWidth(), + minLines = 3, ) } } @@ -241,10 +241,10 @@ fun AddEditGymScreen(gymId: String?, viewModel: ClimbViewModel, onNavigateBack: @OptIn(ExperimentalMaterial3Api::class) @Composable fun AddEditProblemScreen( - problemId: String?, - gymId: String?, - viewModel: ClimbViewModel, - onNavigateBack: () -> Unit + problemId: String?, + gymId: String?, + viewModel: ClimbViewModel, + onNavigateBack: () -> Unit, ) { val isEditing = problemId != null val gyms by viewModel.gyms.collectAsState() @@ -294,9 +294,9 @@ fun AddEditProblemScreen( val availableClimbTypes = selectedGym?.supportedClimbTypes ?: ClimbType.entries.toList() val availableDifficultySystems = - DifficultySystem.systemsForClimbType(selectedClimbType).filter { system -> - selectedGym?.difficultySystems?.contains(system) != false - } + DifficultySystem.systemsForClimbType(selectedClimbType).filter { system -> + selectedGym?.difficultySystems?.contains(system) != false + } // Auto-select climb type if there's only one available LaunchedEffect(availableClimbTypes) { @@ -311,11 +311,11 @@ fun AddEditProblemScreen( // If current system is not compatible, select the first available one selectedDifficultySystem !in availableDifficultySystems -> { selectedDifficultySystem = - availableDifficultySystems.firstOrNull() ?: DifficultySystem.CUSTOM + availableDifficultySystems.firstOrNull() ?: DifficultySystem.CUSTOM } // If there's only one available system and nothing is selected, auto-select it availableDifficultySystems.size == 1 && - selectedDifficultySystem != availableDifficultySystems.first() -> { + selectedDifficultySystem != availableDifficultySystems.first() -> { selectedDifficultySystem = availableDifficultySystems.first() } } @@ -330,106 +330,107 @@ fun AddEditProblemScreen( } Scaffold( - topBar = { - TopAppBar( - title = { Text(if (isEditing) "Edit Problem" else "Add Problem") }, - navigationIcon = { - IconButton(onClick = onNavigateBack) { - Icon( - Icons.AutoMirrored.Filled.ArrowBack, - contentDescription = "Back" - ) + topBar = { + TopAppBar( + title = { Text(if (isEditing) "Edit Problem" else "Add Problem") }, + navigationIcon = { + IconButton(onClick = onNavigateBack) { + Icon( + Icons.AutoMirrored.Filled.ArrowBack, + contentDescription = "Back", + ) + } + }, + actions = { + TextButton( + onClick = { + selectedGym?.let { gym -> + val difficulty = + DifficultyGrade( + system = selectedDifficultySystem, + grade = difficultyGrade, + numericValue = + when ( + selectedDifficultySystem + ) { + DifficultySystem.V_SCALE -> + difficultyGrade + .removePrefix( + "V", + ) + .toIntOrNull() + ?: 0 + else -> + difficultyGrade + .hashCode() % + 100 // Simple mapping for other systems + }, + ) + + val problem = + Problem.create( + gymId = gym.id, + name = problemName.ifBlank { null }, + description = + description.ifBlank { null }, + climbType = selectedClimbType, + difficulty = difficulty, + tags = + tags.split(",") + .map { it.trim() } + .filter { + it.isNotBlank() + }, + location = location.ifBlank { null }, + imagePaths = imagePaths, + notes = notes.ifBlank { null }, + ) + + if (isEditing) { + problemId.let { id -> + viewModel.updateProblem(problem.copy(id = id)) + } + } else { + viewModel.addProblem(problem) + } + onNavigateBack() } }, - actions = { - TextButton( - onClick = { - selectedGym?.let { gym -> - val difficulty = - DifficultyGrade( - system = selectedDifficultySystem, - grade = difficultyGrade, - numericValue = - when (selectedDifficultySystem - ) { - DifficultySystem.V_SCALE -> - difficultyGrade - .removePrefix( - "V" - ) - .toIntOrNull() - ?: 0 - else -> - difficultyGrade - .hashCode() % - 100 // Simple mapping for other systems - } - ) - - val problem = - Problem.create( - gymId = gym.id, - name = problemName.ifBlank { null }, - description = - description.ifBlank { null }, - climbType = selectedClimbType, - difficulty = difficulty, - tags = - tags.split(",") - .map { it.trim() } - .filter { - it.isNotBlank() - }, - location = location.ifBlank { null }, - imagePaths = imagePaths, - notes = notes.ifBlank { null } - ) - - if (isEditing) { - problemId.let { id -> - viewModel.updateProblem(problem.copy(id = id)) - } - } else { - viewModel.addProblem(problem) - } - onNavigateBack() - } - }, - enabled = selectedGym != null && difficultyGrade.isNotBlank() - ) { Text("Save") } - } - ) - } + enabled = selectedGym != null && difficultyGrade.isNotBlank(), + ) { Text("Save") } + }, + ) + }, ) { paddingValues -> LazyColumn( - modifier = Modifier.fillMaxSize().padding(paddingValues).padding(16.dp), - verticalArrangement = Arrangement.spacedBy(16.dp) + modifier = Modifier.fillMaxSize().padding(paddingValues).padding(16.dp), + verticalArrangement = Arrangement.spacedBy(16.dp), ) { // Gym Selection item { Card(modifier = Modifier.fillMaxWidth()) { Column(modifier = Modifier.padding(16.dp)) { Text( - text = "Select Gym", - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.Bold + text = "Select Gym", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold, ) Spacer(modifier = Modifier.height(8.dp)) if (gyms.isEmpty()) { Text( - text = "No gyms available. Add a gym first.", - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.error + text = "No gyms available. Add a gym first.", + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.error, ) } else { LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) { items(gyms) { gym -> FilterChip( - onClick = { selectedGym = gym }, - label = { Text(gym.name) }, - selected = selectedGym?.id == gym.id + onClick = { selectedGym = gym }, + label = { Text(gym.name) }, + selected = selectedGym?.id == gym.id, ) } } @@ -443,31 +444,31 @@ fun AddEditProblemScreen( Card(modifier = Modifier.fillMaxWidth()) { Column(modifier = Modifier.padding(16.dp)) { Text( - text = "Problem Details", - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.Bold + text = "Problem Details", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold, ) Spacer(modifier = Modifier.height(16.dp)) OutlinedTextField( - value = problemName, - onValueChange = { problemName = it }, - label = { Text("Problem Name (Optional)") }, - modifier = Modifier.fillMaxWidth(), - singleLine = true, - placeholder = { Text("e.g., 'The Overhang Monster', 'Yellow V4'") } + value = problemName, + onValueChange = { problemName = it }, + label = { Text("Problem Name (Optional)") }, + modifier = Modifier.fillMaxWidth(), + singleLine = true, + placeholder = { Text("e.g., 'The Overhang Monster', 'Yellow V4'") }, ) Spacer(modifier = Modifier.height(8.dp)) OutlinedTextField( - value = description, - onValueChange = { description = it }, - label = { Text("Description (Optional)") }, - modifier = Modifier.fillMaxWidth(), - minLines = 2, - placeholder = { Text("Describe the problem, holds, style, etc.") } + value = description, + onValueChange = { description = it }, + label = { Text("Description (Optional)") }, + modifier = Modifier.fillMaxWidth(), + minLines = 2, + placeholder = { Text("Describe the problem, holds, style, etc.") }, ) Spacer(modifier = Modifier.height(8.dp)) @@ -475,12 +476,12 @@ fun AddEditProblemScreen( Spacer(modifier = Modifier.height(8.dp)) OutlinedTextField( - value = location, - onValueChange = { location = it }, - label = { Text("Location (Optional)") }, - modifier = Modifier.fillMaxWidth(), - singleLine = true, - placeholder = { Text("e.g., 'Cave area', 'Wall 3', 'Right side'") } + value = location, + onValueChange = { location = it }, + label = { Text("Location (Optional)") }, + modifier = Modifier.fillMaxWidth(), + singleLine = true, + placeholder = { Text("e.g., 'Cave area', 'Wall 3', 'Right side'") }, ) } } @@ -492,9 +493,9 @@ fun AddEditProblemScreen( Card(modifier = Modifier.fillMaxWidth()) { Column(modifier = Modifier.padding(16.dp)) { Text( - text = "Climb Type", - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.Bold + text = "Climb Type", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold, ) Spacer(modifier = Modifier.height(8.dp)) @@ -502,9 +503,9 @@ fun AddEditProblemScreen( Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { availableClimbTypes.forEach { climbType -> FilterChip( - onClick = { selectedClimbType = climbType }, - label = { Text(climbType.displayName) }, - selected = selectedClimbType == climbType + onClick = { selectedClimbType = climbType }, + label = { Text(climbType.displayName) }, + selected = selectedClimbType == climbType, ) } } @@ -519,25 +520,25 @@ fun AddEditProblemScreen( Card(modifier = Modifier.fillMaxWidth()) { Column(modifier = Modifier.padding(16.dp)) { Text( - text = "Difficulty", - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.Bold + text = "Difficulty", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold, ) Spacer(modifier = Modifier.height(8.dp)) Text( - text = "Difficulty System", - style = MaterialTheme.typography.bodyMedium, - fontWeight = FontWeight.Medium + text = "Difficulty System", + style = MaterialTheme.typography.bodyMedium, + fontWeight = FontWeight.Medium, ) LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) { items(availableDifficultySystems) { system -> FilterChip( - onClick = { selectedDifficultySystem = system }, - label = { Text(system.displayName) }, - selected = selectedDifficultySystem == system + onClick = { selectedDifficultySystem = system }, + label = { Text(system.displayName) }, + selected = selectedDifficultySystem == system, ) } } @@ -546,67 +547,67 @@ fun AddEditProblemScreen( if (selectedDifficultySystem == DifficultySystem.CUSTOM) { OutlinedTextField( - value = difficultyGrade, - onValueChange = { newValue -> - // Only allow integers for custom scales - if (newValue.isEmpty() || newValue.all { it.isDigit() } - ) { - difficultyGrade = newValue - } - }, - label = { Text("Grade *") }, - modifier = Modifier.fillMaxWidth(), - singleLine = true, - placeholder = { - Text("Enter numeric grade (e.g. 5, 10, 15)") - }, - supportingText = { - Text("Custom grades must be whole numbers") - }, - keyboardOptions = - KeyboardOptions(keyboardType = KeyboardType.Number) + value = difficultyGrade, + onValueChange = { newValue -> + // Only allow integers for custom scales + if (newValue.isEmpty() || newValue.all { it.isDigit() } + ) { + difficultyGrade = newValue + } + }, + label = { Text("Grade *") }, + modifier = Modifier.fillMaxWidth(), + singleLine = true, + placeholder = { + Text("Enter numeric grade (e.g. 5, 10, 15)") + }, + supportingText = { + Text("Custom grades must be whole numbers") + }, + keyboardOptions = + KeyboardOptions(keyboardType = KeyboardType.Number), ) } else { var expanded by remember { mutableStateOf(false) } val availableGrades = selectedDifficultySystem.availableGrades ExposedDropdownMenuBox( - expanded = expanded, - onExpandedChange = { expanded = !expanded }, - modifier = Modifier.fillMaxWidth() + expanded = expanded, + onExpandedChange = { expanded = !expanded }, + modifier = Modifier.fillMaxWidth(), ) { OutlinedTextField( - value = difficultyGrade, - onValueChange = {}, - readOnly = true, - label = { Text("Grade *") }, - trailingIcon = { - ExposedDropdownMenuDefaults.TrailingIcon( - expanded = expanded - ) - }, - colors = - ExposedDropdownMenuDefaults - .outlinedTextFieldColors(), - modifier = - Modifier.menuAnchor( - ExposedDropdownMenuAnchorType - .PrimaryNotEditable, - enabled = true - ) - .fillMaxWidth() + value = difficultyGrade, + onValueChange = {}, + readOnly = true, + label = { Text("Grade *") }, + trailingIcon = { + ExposedDropdownMenuDefaults.TrailingIcon( + expanded = expanded, + ) + }, + colors = + ExposedDropdownMenuDefaults + .outlinedTextFieldColors(), + modifier = + Modifier.menuAnchor( + ExposedDropdownMenuAnchorType + .PrimaryNotEditable, + enabled = true, + ) + .fillMaxWidth(), ) ExposedDropdownMenu( - expanded = expanded, - onDismissRequest = { expanded = false } + expanded = expanded, + onDismissRequest = { expanded = false }, ) { availableGrades.forEach { grade -> DropdownMenuItem( - text = { Text(grade) }, - onClick = { - difficultyGrade = grade - expanded = false - } + text = { Text(grade) }, + onClick = { + difficultyGrade = grade + expanded = false + }, ) } } @@ -622,17 +623,17 @@ fun AddEditProblemScreen( Card(modifier = Modifier.fillMaxWidth()) { Column(modifier = Modifier.padding(16.dp)) { Text( - text = "Photos", - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.Bold + text = "Photos", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold, ) Spacer(modifier = Modifier.height(16.dp)) ImagePicker( - imageUris = imagePaths, - onImagesChanged = { imagePaths = it }, - maxImages = 5 + imageUris = imagePaths, + onImagesChanged = { imagePaths = it }, + maxImages = 5, ) } } @@ -642,50 +643,50 @@ fun AddEditProblemScreen( Card(modifier = Modifier.fillMaxWidth()) { Column(modifier = Modifier.padding(16.dp)) { Text( - text = "Additional Info", - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.Bold + text = "Additional Info", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold, ) Spacer(modifier = Modifier.height(16.dp)) OutlinedTextField( - value = tags, - onValueChange = { tags = it }, - label = { Text("Tags (Optional)") }, - modifier = Modifier.fillMaxWidth(), - singleLine = true, - placeholder = { Text("e.g., crimpy, dynamic (comma-separated)") } + value = tags, + onValueChange = { tags = it }, + label = { Text("Tags (Optional)") }, + modifier = Modifier.fillMaxWidth(), + singleLine = true, + placeholder = { Text("e.g., crimpy, dynamic (comma-separated)") }, ) Spacer(modifier = Modifier.height(8.dp)) OutlinedTextField( - value = notes, - onValueChange = { notes = it }, - label = { Text("Notes (Optional)") }, - modifier = Modifier.fillMaxWidth(), - minLines = 3, - placeholder = { Text("Any additional notes about this problem") } + value = notes, + onValueChange = { notes = it }, + label = { Text("Notes (Optional)") }, + modifier = Modifier.fillMaxWidth(), + minLines = 3, + placeholder = { Text("Any additional notes about this problem") }, ) Spacer(modifier = Modifier.height(16.dp)) Row( - verticalAlignment = Alignment.CenterVertically, - modifier = - Modifier.fillMaxWidth() - .selectable( - selected = isActive, - onClick = { isActive = !isActive }, - role = Role.Checkbox - ) + verticalAlignment = Alignment.CenterVertically, + modifier = + Modifier.fillMaxWidth() + .selectable( + selected = isActive, + onClick = { isActive = !isActive }, + role = Role.Checkbox, + ), ) { Checkbox(checked = isActive, onCheckedChange = null) Spacer(modifier = Modifier.width(8.dp)) Text( - text = "Problem is currently active", - style = MaterialTheme.typography.bodyMedium + text = "Problem is currently active", + style = MaterialTheme.typography.bodyMedium, ) } } @@ -698,10 +699,10 @@ fun AddEditProblemScreen( @OptIn(ExperimentalMaterial3Api::class) @Composable fun AddEditSessionScreen( - sessionId: String?, - gymId: String?, - viewModel: ClimbViewModel, - onNavigateBack: () -> Unit + sessionId: String?, + gymId: String?, + viewModel: ClimbViewModel, + onNavigateBack: () -> Unit, ) { val isEditing = sessionId != null val gyms by viewModel.gyms.collectAsState() @@ -738,78 +739,78 @@ fun AddEditSessionScreen( } Scaffold( - topBar = { - TopAppBar( - title = { Text(if (isEditing) "Edit Session" else "Add Session") }, - navigationIcon = { - IconButton(onClick = onNavigateBack) { - Icon( - Icons.AutoMirrored.Filled.ArrowBack, - contentDescription = "Back" - ) + topBar = { + TopAppBar( + title = { Text(if (isEditing) "Edit Session" else "Add Session") }, + navigationIcon = { + IconButton(onClick = onNavigateBack) { + Icon( + Icons.AutoMirrored.Filled.ArrowBack, + contentDescription = "Back", + ) + } + }, + actions = { + TextButton( + onClick = { + selectedGym?.let { gym -> + if (isEditing) { + val session = + ClimbSession.create( + gymId = gym.id, + notes = + sessionNotes.ifBlank { + null + }, + ) + sessionId.let { id -> + viewModel.updateSession(session.copy(id = id)) + } + } else { + viewModel.startSession( + context, + gym.id, + sessionNotes.ifBlank { null }, + ) + } + onNavigateBack() } }, - actions = { - TextButton( - onClick = { - selectedGym?.let { gym -> - if (isEditing) { - val session = - ClimbSession.create( - gymId = gym.id, - notes = - sessionNotes.ifBlank { - null - } - ) - sessionId.let { id -> - viewModel.updateSession(session.copy(id = id)) - } - } else { - viewModel.startSession( - context, - gym.id, - sessionNotes.ifBlank { null } - ) - } - onNavigateBack() - } - }, - enabled = selectedGym != null - ) { Text("Save") } - } - ) - } + enabled = selectedGym != null, + ) { Text("Save") } + }, + ) + }, ) { paddingValues -> LazyColumn( - modifier = Modifier.fillMaxSize().padding(paddingValues).padding(16.dp), - verticalArrangement = Arrangement.spacedBy(16.dp) + modifier = Modifier.fillMaxSize().padding(paddingValues).padding(16.dp), + verticalArrangement = Arrangement.spacedBy(16.dp), ) { // Gym Selection item { Card(modifier = Modifier.fillMaxWidth()) { Column(modifier = Modifier.padding(16.dp)) { Text( - text = "Select Gym", - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.Bold + text = "Select Gym", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold, ) Spacer(modifier = Modifier.height(8.dp)) if (gyms.isEmpty()) { Text( - text = "No gyms available. Add a gym first.", - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.error + text = "No gyms available. Add a gym first.", + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.error, ) } else { LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) { items(gyms) { gym -> FilterChip( - onClick = { selectedGym = gym }, - label = { Text(gym.name) }, - selected = selectedGym?.id == gym.id + onClick = { selectedGym = gym }, + label = { Text(gym.name) }, + selected = selectedGym?.id == gym.id, ) } } @@ -823,41 +824,41 @@ fun AddEditSessionScreen( Card(modifier = Modifier.fillMaxWidth()) { Column(modifier = Modifier.padding(16.dp)) { Text( - text = "Session Details", - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.Bold + text = "Session Details", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold, ) Spacer(modifier = Modifier.height(16.dp)) OutlinedTextField( - value = sessionDate, - onValueChange = { sessionDate = it }, - label = { Text("Date (YYYY-MM-DD)") }, - modifier = Modifier.fillMaxWidth(), - singleLine = true + value = sessionDate, + onValueChange = { sessionDate = it }, + label = { Text("Date (YYYY-MM-DD)") }, + modifier = Modifier.fillMaxWidth(), + singleLine = true, ) Spacer(modifier = Modifier.height(8.dp)) OutlinedTextField( - value = duration, - onValueChange = { duration = it }, - label = { Text("Duration (minutes)") }, - modifier = Modifier.fillMaxWidth(), - singleLine = true, - keyboardOptions = - KeyboardOptions(keyboardType = KeyboardType.Number) + value = duration, + onValueChange = { duration = it }, + label = { Text("Duration (minutes)") }, + modifier = Modifier.fillMaxWidth(), + singleLine = true, + keyboardOptions = + KeyboardOptions(keyboardType = KeyboardType.Number), ) Spacer(modifier = Modifier.height(8.dp)) OutlinedTextField( - value = sessionNotes, - onValueChange = { sessionNotes = it }, - label = { Text("Session Notes (Optional)") }, - modifier = Modifier.fillMaxWidth(), - minLines = 3 + value = sessionNotes, + onValueChange = { sessionNotes = it }, + label = { Text("Session Notes (Optional)") }, + modifier = Modifier.fillMaxWidth(), + minLines = 3, ) } } diff --git a/android/app/src/main/java/com/atridad/ascently/ui/screens/AnalyticsScreen.kt b/android/app/src/main/java/com/atridad/ascently/ui/screens/AnalyticsScreen.kt index a41ba16..8666f9a 100644 --- a/android/app/src/main/java/com/atridad/ascently/ui/screens/AnalyticsScreen.kt +++ b/android/app/src/main/java/com/atridad/ascently/ui/screens/AnalyticsScreen.kt @@ -28,26 +28,26 @@ fun AnalyticsScreen(viewModel: ClimbViewModel) { val gyms by viewModel.gyms.collectAsState() LazyColumn( - modifier = Modifier.fillMaxSize().padding(16.dp), - verticalArrangement = Arrangement.spacedBy(16.dp) + modifier = Modifier.fillMaxSize().padding(16.dp), + verticalArrangement = Arrangement.spacedBy(16.dp), ) { item { Row( - modifier = Modifier.fillMaxWidth(), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(12.dp) + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(12.dp), ) { Icon( - painter = painterResource(id = R.drawable.ic_mountains), - contentDescription = "Ascently Logo", - modifier = Modifier.size(32.dp), - tint = MaterialTheme.colorScheme.primary + painter = painterResource(id = R.drawable.ic_mountains), + contentDescription = "Ascently Logo", + modifier = Modifier.size(32.dp), + tint = MaterialTheme.colorScheme.primary, ) Text( - text = "Analytics", - style = MaterialTheme.typography.headlineMedium, - fontWeight = FontWeight.Bold, - modifier = Modifier.weight(1f) + text = "Analytics", + style = MaterialTheme.typography.headlineMedium, + fontWeight = FontWeight.Bold, + modifier = Modifier.weight(1f), ) SyncIndicator(isSyncing = viewModel.syncService.isSyncing) } @@ -56,10 +56,10 @@ fun AnalyticsScreen(viewModel: ClimbViewModel) { // Overall Stats item { OverallStatsCard( - totalSessions = sessions.size, - totalProblems = problems.size, - totalAttempts = attempts.size, - totalGyms = gyms.size + totalSessions = sessions.size, + totalProblems = problems.size, + totalAttempts = attempts.size, + totalGyms = gyms.size, ) } @@ -72,14 +72,14 @@ fun AnalyticsScreen(viewModel: ClimbViewModel) { // Favorite Gym item { val favoriteGym = - sessions.groupBy { it.gymId }.maxByOrNull { it.value.size }?.let { - (gymId, sessions) -> - gyms.find { it.id == gymId }?.name to sessions.size - } + sessions.groupBy { it.gymId }.maxByOrNull { it.value.size }?.let { + (gymId, sessions) -> + gyms.find { it.id == gymId }?.name to sessions.size + } FavoriteGymCard( - gymName = favoriteGym?.first ?: "No sessions yet", - sessionCount = favoriteGym?.second ?: 0 + gymName = favoriteGym?.first ?: "No sessions yet", + sessionCount = favoriteGym?.second ?: 0, ) } @@ -96,16 +96,16 @@ fun OverallStatsCard(totalSessions: Int, totalProblems: Int, totalAttempts: Int, Card(modifier = Modifier.fillMaxWidth()) { Column(modifier = Modifier.fillMaxWidth().padding(16.dp)) { Text( - text = "Overall Stats", - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.Bold + text = "Overall Stats", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold, ) Spacer(modifier = Modifier.height(12.dp)) Row( - modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.SpaceEvenly + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceEvenly, ) { StatItem(label = "Sessions", value = totalSessions.toString()) StatItem(label = "Problems", value = totalProblems.toString()) @@ -121,113 +121,113 @@ fun OverallStatsCard(totalSessions: Int, totalProblems: Int, totalAttempts: Int, fun GradeDistributionChartCard(gradeDistributionData: List) { // Find all grading systems that have been used in the data val usedSystems = - remember(gradeDistributionData) { - gradeDistributionData.map { it.difficultySystem }.distinct() - } + remember(gradeDistributionData) { + gradeDistributionData.map { it.difficultySystem }.distinct() + } var selectedSystem by - remember(usedSystems) { - mutableStateOf(usedSystems.firstOrNull() ?: DifficultySystem.V_SCALE) - } + remember(usedSystems) { + mutableStateOf(usedSystems.firstOrNull() ?: DifficultySystem.V_SCALE) + } var expanded by remember { mutableStateOf(false) } var showAllTime by remember { mutableStateOf(true) } Card(modifier = Modifier.fillMaxWidth()) { Column(modifier = Modifier.fillMaxWidth().padding(16.dp)) { Text( - text = "Grade Distribution", - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.Bold + text = "Grade Distribution", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold, ) Spacer(modifier = Modifier.height(12.dp)) // Toggles section Row( - modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.SpaceBetween, - verticalAlignment = Alignment.CenterVertically + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically, ) { // Time period toggle Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { // All Time button FilterChip( - onClick = { showAllTime = true }, - label = { - Text("All Time", style = MaterialTheme.typography.bodySmall) - }, - selected = showAllTime, - colors = - FilterChipDefaults.filterChipColors( - selectedContainerColor = - MaterialTheme.colorScheme.primary, - selectedLabelColor = MaterialTheme.colorScheme.onPrimary - ) + onClick = { showAllTime = true }, + label = { + Text("All Time", style = MaterialTheme.typography.bodySmall) + }, + selected = showAllTime, + colors = + FilterChipDefaults.filterChipColors( + selectedContainerColor = + MaterialTheme.colorScheme.primary, + selectedLabelColor = MaterialTheme.colorScheme.onPrimary, + ), ) // 7 Days button FilterChip( - onClick = { showAllTime = false }, - label = { Text("7 Days", style = MaterialTheme.typography.bodySmall) }, - selected = !showAllTime, - colors = - FilterChipDefaults.filterChipColors( - selectedContainerColor = - MaterialTheme.colorScheme.primary, - selectedLabelColor = MaterialTheme.colorScheme.onPrimary - ) + onClick = { showAllTime = false }, + label = { Text("7 Days", style = MaterialTheme.typography.bodySmall) }, + selected = !showAllTime, + colors = + FilterChipDefaults.filterChipColors( + selectedContainerColor = + MaterialTheme.colorScheme.primary, + selectedLabelColor = MaterialTheme.colorScheme.onPrimary, + ), ) } // Scale selector dropdown if (usedSystems.size > 1) { ExposedDropdownMenuBox( - expanded = expanded, - onExpandedChange = { expanded = !expanded } + expanded = expanded, + onExpandedChange = { expanded = !expanded }, ) { OutlinedTextField( - value = - when (selectedSystem) { - DifficultySystem.V_SCALE -> "V-Scale" - DifficultySystem.FONT -> "Font" - DifficultySystem.YDS -> "YDS" - DifficultySystem.CUSTOM -> "Custom" - }, - onValueChange = {}, - readOnly = true, - trailingIcon = { - ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded) - }, - modifier = - Modifier.menuAnchor( - type = - ExposedDropdownMenuAnchorType - .PrimaryNotEditable, - enabled = true - ) - .width(120.dp), - textStyle = MaterialTheme.typography.bodyMedium + value = + when (selectedSystem) { + DifficultySystem.V_SCALE -> "V-Scale" + DifficultySystem.FONT -> "Font" + DifficultySystem.YDS -> "YDS" + DifficultySystem.CUSTOM -> "Custom" + }, + onValueChange = {}, + readOnly = true, + trailingIcon = { + ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded) + }, + modifier = + Modifier.menuAnchor( + type = + ExposedDropdownMenuAnchorType + .PrimaryNotEditable, + enabled = true, + ) + .width(120.dp), + textStyle = MaterialTheme.typography.bodyMedium, ) ExposedDropdownMenu( - expanded = expanded, - onDismissRequest = { expanded = false } + expanded = expanded, + onDismissRequest = { expanded = false }, ) { usedSystems.forEach { system -> DropdownMenuItem( - text = { - Text( - when (system) { - DifficultySystem.V_SCALE -> "V-Scale" - DifficultySystem.FONT -> "Font" - DifficultySystem.YDS -> "YDS" - DifficultySystem.CUSTOM -> "Custom" - } - ) - }, - onClick = { - selectedSystem = system - expanded = false - } + text = { + Text( + when (system) { + DifficultySystem.V_SCALE -> "V-Scale" + DifficultySystem.FONT -> "Font" + DifficultySystem.YDS -> "YDS" + DifficultySystem.CUSTOM -> "Custom" + }, + ) + }, + onClick = { + selectedSystem = system + expanded = false + }, ) } } @@ -239,89 +239,91 @@ fun GradeDistributionChartCard(gradeDistributionData: List - try { - val attemptDate = - DateFormatUtils.parseToLocalDateTime(dataPoint.date) - attemptDate?.isAfter(sevenDaysAgo) == true - } catch (_: Exception) { - // If date parsing fails, include the data point - true - } + if (showAllTime) { + systemFiltered + } else { + // Filter for last 7 days + val sevenDaysAgo = LocalDateTime.now().minusDays(7) + systemFiltered.filter { dataPoint -> + try { + val attemptDate = + DateFormatUtils.parseToLocalDateTime(dataPoint.date) + attemptDate?.isAfter(sevenDaysAgo) == true + } catch (_: Exception) { + // If date parsing fails, include the data point + true } } } + } if (filteredGradeData.isNotEmpty()) { // Group by grade and sum counts val gradeGroups = - filteredGradeData - .groupBy { it.grade } - .mapValues { (_, dataPoints) -> dataPoints.sumOf { it.count } } - .map { (grade, count) -> - val firstDataPoint = - filteredGradeData.first { it.grade == grade } - BarChartDataPoint( - label = grade, - value = count, - gradeNumeric = firstDataPoint.gradeNumeric - ) - } + filteredGradeData + .groupBy { it.grade } + .mapValues { (_, dataPoints) -> dataPoints.sumOf { it.count } } + .map { (grade, count) -> + val firstDataPoint = + filteredGradeData.first { it.grade == grade } + BarChartDataPoint( + label = grade, + value = count, + gradeNumeric = firstDataPoint.gradeNumeric, + ) + } BarChart(data = gradeGroups, modifier = Modifier.fillMaxWidth().height(220.dp)) Spacer(modifier = Modifier.height(8.dp)) Text( - text = - "Successful climbs by ${when(selectedSystem) { + text = + "Successful climbs by ${when (selectedSystem) { DifficultySystem.V_SCALE -> "V-grade" DifficultySystem.FONT -> "Font grade" DifficultySystem.YDS -> "YDS grade" DifficultySystem.CUSTOM -> "custom grade" }}", - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } else { Column( - modifier = Modifier.fillMaxWidth().height(220.dp), - horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.Center + modifier = Modifier.fillMaxWidth().height(220.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center, ) { Icon( - painter = painterResource(id = R.drawable.ic_mountains), - contentDescription = "No data", - modifier = Modifier.size(48.dp), - tint = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f) + painter = painterResource(id = R.drawable.ic_mountains), + contentDescription = "No data", + modifier = Modifier.size(48.dp), + tint = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f), ) Spacer(modifier = Modifier.height(8.dp)) Text( - text = "No data available.", - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant + text = "No data available.", + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) Text( - text = - if (showAllTime) - "Complete some climbs to see your grade distribution!" - else "No climbs in the last 7 days", - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f) + text = + if (showAllTime) { + "Complete some climbs to see your grade distribution!" + } else { + "No climbs in the last 7 days" + }, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f), ) } } @@ -334,24 +336,24 @@ fun FavoriteGymCard(gymName: String, sessionCount: Int) { Card(modifier = Modifier.fillMaxWidth()) { Column(modifier = Modifier.fillMaxWidth().padding(16.dp)) { Text( - text = "Favorite Gym", - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.Bold + text = "Favorite Gym", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold, ) Spacer(modifier = Modifier.height(8.dp)) Text( - text = gymName, - style = MaterialTheme.typography.titleLarge, - fontWeight = FontWeight.Medium + text = gymName, + style = MaterialTheme.typography.titleLarge, + fontWeight = FontWeight.Medium, ) if (sessionCount > 0) { Text( - text = "$sessionCount sessions", - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant + text = "$sessionCount sessions", + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } } @@ -363,39 +365,39 @@ fun RecentActivityCard(recentSessions: Int) { Card(modifier = Modifier.fillMaxWidth()) { Column(modifier = Modifier.fillMaxWidth().padding(16.dp)) { Text( - text = "Recent Activity", - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.Bold + text = "Recent Activity", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold, ) Spacer(modifier = Modifier.height(8.dp)) Text( - text = - if (recentSessions > 0) { - "You've had $recentSessions recent sessions" - } else { - "No recent activity" - }, - style = MaterialTheme.typography.bodyMedium + text = + if (recentSessions > 0) { + "You've had $recentSessions recent sessions" + } else { + "No recent activity" + }, + style = MaterialTheme.typography.bodyMedium, ) } } } data class GradeDistributionDataPoint( - val date: String, - val grade: String, - val gradeNumeric: Int, - val count: Int, - val climbType: ClimbType, - val difficultySystem: DifficultySystem + val date: String, + val grade: String, + val gradeNumeric: Int, + val count: Int, + val climbType: ClimbType, + val difficultySystem: DifficultySystem, ) fun calculateGradeDistribution( - sessions: List, - problems: List, - attempts: List + sessions: List, + problems: List, + attempts: List, ): List { if (sessions.isEmpty() || problems.isEmpty() || attempts.isEmpty()) { return emptyList() @@ -403,9 +405,9 @@ fun calculateGradeDistribution( // Get all successful attempts val successfulAttempts = - attempts.filter { - it.result == AttemptResult.SUCCESS || it.result == AttemptResult.FLASH - } + attempts.filter { + it.result == AttemptResult.SUCCESS || it.result == AttemptResult.FLASH + } if (successfulAttempts.isEmpty()) { return emptyList() @@ -426,18 +428,18 @@ fun calculateGradeDistribution( gradeDistribution[key] = existing.copy(count = existing.count + 1) } else { gradeDistribution[key] = - GradeDistributionDataPoint( - date = attempt.timestamp, - grade = problem.difficulty.grade, - gradeNumeric = - gradeToNumeric( - problem.difficulty.system, - problem.difficulty.grade - ), - count = 1, - climbType = problem.climbType, - difficultySystem = problem.difficulty.system - ) + GradeDistributionDataPoint( + date = attempt.timestamp, + grade = problem.difficulty.grade, + gradeNumeric = + gradeToNumeric( + problem.difficulty.system, + problem.difficulty.grade, + ), + count = 1, + climbType = problem.climbType, + difficultySystem = problem.difficulty.system, + ) } } } diff --git a/android/app/src/main/java/com/atridad/ascently/ui/screens/DetailScreens.kt b/android/app/src/main/java/com/atridad/ascently/ui/screens/DetailScreens.kt index 2a91619..7d4cdfe 100644 --- a/android/app/src/main/java/com/atridad/ascently/ui/screens/DetailScreens.kt +++ b/android/app/src/main/java/com/atridad/ascently/ui/screens/DetailScreens.kt @@ -40,10 +40,10 @@ import kotlinx.coroutines.flow.first @OptIn(ExperimentalMaterial3Api::class) @Composable fun EditAttemptDialog( - attempt: Attempt, - problems: List, - onDismiss: () -> Unit, - onAttemptUpdated: (Attempt) -> Unit + attempt: Attempt, + problems: List, + onDismiss: () -> Unit, + onAttemptUpdated: (Attempt) -> Unit, ) { var selectedProblem by remember { mutableStateOf(problems.find { it.id == attempt.problemId }) } var selectedResult by remember { mutableStateOf(attempt.result) } @@ -53,59 +53,62 @@ fun EditAttemptDialog( Dialog(onDismissRequest = onDismiss) { Card(modifier = Modifier.fillMaxWidth().padding(16.dp)) { Column( - modifier = Modifier.fillMaxSize().padding(24.dp), - verticalArrangement = Arrangement.spacedBy(20.dp) + modifier = Modifier.fillMaxSize().padding(24.dp), + verticalArrangement = Arrangement.spacedBy(20.dp), ) { Text( - text = "Edit Attempt", - style = MaterialTheme.typography.headlineSmall, - fontWeight = FontWeight.Bold + text = "Edit Attempt", + style = MaterialTheme.typography.headlineSmall, + fontWeight = FontWeight.Bold, ) // Problem Selection Text( - text = "Problem", - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.Medium + text = "Problem", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Medium, ) if (problems.isEmpty()) { Text( - text = "No problems available.", - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.error + text = "No problems available.", + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.error, ) } else { var expanded by remember { mutableStateOf(false) } Box(modifier = Modifier.fillMaxWidth()) { OutlinedTextField( - value = selectedProblem?.name ?: "Unknown Problem", - onValueChange = {}, - readOnly = true, - label = { Text("Problem") }, - trailingIcon = { - Icon( - if (expanded) Icons.Default.KeyboardArrowUp - else Icons.Default.KeyboardArrowDown, - contentDescription = "Toggle dropdown" - ) - }, - modifier = Modifier.fillMaxWidth().clickable { expanded = true } + value = selectedProblem?.name ?: "Unknown Problem", + onValueChange = {}, + readOnly = true, + label = { Text("Problem") }, + trailingIcon = { + Icon( + if (expanded) { + Icons.Default.KeyboardArrowUp + } else { + Icons.Default.KeyboardArrowDown + }, + contentDescription = "Toggle dropdown", + ) + }, + modifier = Modifier.fillMaxWidth().clickable { expanded = true }, ) DropdownMenu( - expanded = expanded, - onDismissRequest = { expanded = false }, - modifier = Modifier.fillMaxWidth(0.9f) + expanded = expanded, + onDismissRequest = { expanded = false }, + modifier = Modifier.fillMaxWidth(0.9f), ) { problems.forEach { problem -> DropdownMenuItem( - text = { Text(problem.name ?: "Unknown Problem") }, - onClick = { - selectedProblem = problem - expanded = false - } + text = { Text(problem.name ?: "Unknown Problem") }, + onClick = { + selectedProblem = problem + expanded = false + }, ) } } @@ -114,39 +117,39 @@ fun EditAttemptDialog( // Result Selection Text( - text = "Result", - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.Medium + text = "Result", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Medium, ) Column( - modifier = Modifier.fillMaxWidth(), - verticalArrangement = Arrangement.spacedBy(8.dp) + modifier = Modifier.fillMaxWidth(), + verticalArrangement = Arrangement.spacedBy(8.dp), ) { AttemptResult.entries.forEach { result -> Row( - modifier = - Modifier.fillMaxWidth() - .selectable( - selected = selectedResult == result, - onClick = { selectedResult = result }, - role = Role.RadioButton - ) - .padding(8.dp), - verticalAlignment = Alignment.CenterVertically + modifier = + Modifier.fillMaxWidth() + .selectable( + selected = selectedResult == result, + onClick = { selectedResult = result }, + role = Role.RadioButton, + ) + .padding(8.dp), + verticalAlignment = Alignment.CenterVertically, ) { RadioButton(selected = selectedResult == result, onClick = null) Spacer(modifier = Modifier.width(8.dp)) Text( - text = - when (result) { - AttemptResult.NO_PROGRESS -> "No Progress" - else -> - result.name.lowercase().replaceFirstChar { - it.uppercase() - } - }, - style = MaterialTheme.typography.bodyMedium + text = + when (result) { + AttemptResult.NO_PROGRESS -> "No Progress" + else -> + result.name.lowercase().replaceFirstChar { + it.uppercase() + } + }, + style = MaterialTheme.typography.bodyMedium, ) } } @@ -154,48 +157,48 @@ fun EditAttemptDialog( // Highest Hold OutlinedTextField( - value = highestHold, - onValueChange = { highestHold = it }, - label = { Text("Highest Hold (Optional)") }, - placeholder = { Text("e.g., 'jug on the left'") }, - modifier = Modifier.fillMaxWidth(), - singleLine = true + value = highestHold, + onValueChange = { highestHold = it }, + label = { Text("Highest Hold (Optional)") }, + placeholder = { Text("e.g., 'jug on the left'") }, + modifier = Modifier.fillMaxWidth(), + singleLine = true, ) // 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'") } + 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) + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(8.dp), ) { TextButton(onClick = onDismiss, modifier = Modifier.weight(1f)) { Text("Cancel") } Button( - onClick = { - selectedProblem?.let { problem -> - val updatedAttempt = - attempt.copy( - problemId = problem.id, - result = selectedResult, - highestHold = highestHold.ifBlank { null }, - notes = notes.ifBlank { null } - ) - onAttemptUpdated(updatedAttempt) - } - }, - enabled = selectedProblem != null, - modifier = Modifier.weight(1f) + onClick = { + selectedProblem?.let { problem -> + val updatedAttempt = + attempt.copy( + problemId = problem.id, + result = selectedResult, + highestHold = highestHold.ifBlank { null }, + notes = notes.ifBlank { null }, + ) + onAttemptUpdated(updatedAttempt) + } + }, + enabled = selectedProblem != null, + modifier = Modifier.weight(1f), ) { Text("Update") } } } @@ -206,10 +209,10 @@ fun EditAttemptDialog( @OptIn(ExperimentalMaterial3Api::class) @Composable fun SessionDetailScreen( - sessionId: String, - viewModel: ClimbViewModel, - onNavigateBack: () -> Unit, - onNavigateToProblemDetail: (String) -> Unit = {} + sessionId: String, + viewModel: ClimbViewModel, + onNavigateBack: () -> Unit, + onNavigateToProblemDetail: (String) -> Unit = {}, ) { val context = LocalContext.current val attempts by viewModel.getAttemptsBySession(sessionId).collectAsState(initial = emptyList()) @@ -227,93 +230,93 @@ fun SessionDetailScreen( // Calculate stats val successfulAttempts = - attempts.filter { it.result in listOf(AttemptResult.SUCCESS, AttemptResult.FLASH) } + attempts.filter { it.result in listOf(AttemptResult.SUCCESS, AttemptResult.FLASH) } val uniqueProblems = attempts.map { it.problemId }.distinct() val completedProblems = successfulAttempts.map { it.problemId }.distinct() val attemptsWithProblems = - attempts - .mapNotNull { attempt -> - val problem = problems.find { it.id == attempt.problemId } - if (problem != null) attempt to problem else null - } - .sortedBy { attempt -> - // Sort by timestamp (when attempt was logged) - attempt.first.timestamp - } + attempts + .mapNotNull { attempt -> + val problem = problems.find { it.id == attempt.problemId } + if (problem != null) attempt to problem else null + } + .sortedBy { attempt -> + // Sort by timestamp (when attempt was logged) + attempt.first.timestamp + } Scaffold( - topBar = { - TopAppBar( - title = { Text("Session Details") }, - navigationIcon = { - IconButton(onClick = onNavigateBack) { - Icon( - Icons.AutoMirrored.Filled.ArrowBack, - contentDescription = "Back" - ) - } - }, - actions = { - // No manual actions needed - Health Connect syncs automatically when - // sessions complete - - // Show stop icon for active sessions, delete icon for completed - // sessions - if (session?.status == SessionStatus.ACTIVE) { - IconButton( - onClick = { - session.let { s -> - viewModel.endSession(context, s.id) - onNavigateBack() - } - } - ) { - Icon( - imageVector = - CustomIcons.Stop( - MaterialTheme.colorScheme.onSurface - ), - contentDescription = "Stop Session" - ) - } - } else { - IconButton(onClick = { showDeleteDialog = true }) { - Icon(Icons.Default.Delete, contentDescription = "Delete") - } - } - } - ) - }, - floatingActionButton = { - if (session?.status == SessionStatus.ACTIVE) { - FloatingActionButton(onClick = { showAddAttemptDialog = true }) { - Icon(Icons.Default.Add, contentDescription = "Add Attempt") + topBar = { + TopAppBar( + title = { Text("Session Details") }, + navigationIcon = { + IconButton(onClick = onNavigateBack) { + Icon( + Icons.AutoMirrored.Filled.ArrowBack, + contentDescription = "Back", + ) } + }, + actions = { + // No manual actions needed - Health Connect syncs automatically when + // sessions complete + + // Show stop icon for active sessions, delete icon for completed + // sessions + if (session?.status == SessionStatus.ACTIVE) { + IconButton( + onClick = { + session.let { s -> + viewModel.endSession(context, s.id) + onNavigateBack() + } + }, + ) { + Icon( + imageVector = + CustomIcons.Stop( + MaterialTheme.colorScheme.onSurface, + ), + contentDescription = "Stop Session", + ) + } + } else { + IconButton(onClick = { showDeleteDialog = true }) { + Icon(Icons.Default.Delete, contentDescription = "Delete") + } + } + }, + ) + }, + floatingActionButton = { + if (session?.status == SessionStatus.ACTIVE) { + FloatingActionButton(onClick = { showAddAttemptDialog = true }) { + Icon(Icons.Default.Add, contentDescription = "Add Attempt") } } + }, ) { paddingValues -> LazyColumn( - modifier = Modifier.fillMaxSize().padding(paddingValues).padding(16.dp), - verticalArrangement = Arrangement.spacedBy(16.dp) + modifier = Modifier.fillMaxSize().padding(paddingValues).padding(16.dp), + verticalArrangement = Arrangement.spacedBy(16.dp), ) { // Session Header item { Card(modifier = Modifier.fillMaxWidth()) { Column(modifier = Modifier.padding(20.dp)) { Text( - text = gym?.name ?: "Unknown Gym", - style = MaterialTheme.typography.headlineMedium, - fontWeight = FontWeight.Bold + text = gym?.name ?: "Unknown Gym", + style = MaterialTheme.typography.headlineMedium, + fontWeight = FontWeight.Bold, ) Spacer(modifier = Modifier.height(8.dp)) Text( - text = formatDate(session?.date ?: ""), - style = MaterialTheme.typography.titleLarge, - color = MaterialTheme.colorScheme.primary + text = formatDate(session?.date ?: ""), + style = MaterialTheme.typography.titleLarge, + color = MaterialTheme.colorScheme.primary, ) session?.let { s -> @@ -323,9 +326,9 @@ fun SessionDetailScreen( val timeText = "Duration: ${s.duration} minutes" Text( - text = timeText, - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant + text = timeText, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } } @@ -339,24 +342,31 @@ fun SessionDetailScreen( Spacer(modifier = Modifier.height(12.dp)) Surface( - color = - if (session?.duration != null) - MaterialTheme.colorScheme.primaryContainer - else MaterialTheme.colorScheme.secondaryContainer, - shape = RoundedCornerShape(12.dp) + color = + if (session?.duration != null) { + MaterialTheme.colorScheme.primaryContainer + } else { + MaterialTheme.colorScheme.secondaryContainer + }, + shape = RoundedCornerShape(12.dp), ) { Text( - text = - if (session?.duration != null) "Completed" - else "In Progress", - modifier = - Modifier.padding(horizontal = 12.dp, vertical = 6.dp), - style = MaterialTheme.typography.labelMedium, - color = - if (session?.duration != null) - MaterialTheme.colorScheme.onPrimaryContainer - else MaterialTheme.colorScheme.onSecondaryContainer, - fontWeight = FontWeight.Medium + text = + if (session?.duration != null) { + "Completed" + } else { + "In Progress" + }, + modifier = + Modifier.padding(horizontal = 12.dp, vertical = 6.dp), + style = MaterialTheme.typography.labelMedium, + color = + if (session?.duration != null) { + MaterialTheme.colorScheme.onPrimaryContainer + } else { + MaterialTheme.colorScheme.onSecondaryContainer + }, + fontWeight = FontWeight.Medium, ) } } @@ -368,41 +378,41 @@ fun SessionDetailScreen( Card(modifier = Modifier.fillMaxWidth()) { Column(modifier = Modifier.padding(20.dp)) { Text( - text = "Session Stats", - style = MaterialTheme.typography.titleLarge, - fontWeight = FontWeight.Bold + text = "Session Stats", + style = MaterialTheme.typography.titleLarge, + fontWeight = FontWeight.Bold, ) Spacer(modifier = Modifier.height(16.dp)) if (attempts.isEmpty()) { Text( - text = "No attempts recorded yet", - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant + text = "No attempts recorded yet", + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } else { Row( - modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.SpaceEvenly + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceEvenly, ) { StatItem(label = "Total Attempts", value = attempts.size.toString()) StatItem(label = "Problems", value = uniqueProblems.size.toString()) StatItem( - label = "Successful", - value = successfulAttempts.size.toString() + label = "Successful", + value = successfulAttempts.size.toString(), ) } Spacer(modifier = Modifier.height(16.dp)) Row( - modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.SpaceEvenly + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceEvenly, ) { StatItem( - label = "Completed", - value = completedProblems.size.toString() + label = "Completed", + value = completedProblems.size.toString(), ) } } @@ -413,9 +423,9 @@ fun SessionDetailScreen( // Attempts List item { Text( - text = "Attempts (${attempts.size})", - style = MaterialTheme.typography.titleLarge, - fontWeight = FontWeight.Bold + text = "Attempts (${attempts.size})", + style = MaterialTheme.typography.titleLarge, + fontWeight = FontWeight.Bold, ) } @@ -423,19 +433,19 @@ fun SessionDetailScreen( item { Card(modifier = Modifier.fillMaxWidth()) { Column( - modifier = Modifier.fillMaxWidth().padding(20.dp), - horizontalAlignment = Alignment.CenterHorizontally + modifier = Modifier.fillMaxWidth().padding(20.dp), + horizontalAlignment = Alignment.CenterHorizontally, ) { Text( - text = "No attempts yet", - style = MaterialTheme.typography.titleMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant + text = "No attempts yet", + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) Spacer(modifier = Modifier.height(8.dp)) Text( - text = "Start attempting problems to see your progress!", - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant + text = "Start attempting problems to see your progress!", + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } } @@ -444,15 +454,15 @@ fun SessionDetailScreen( items(attemptsWithProblems.size) { index -> val (attempt, problem) = attemptsWithProblems[index] SessionAttemptCard( - attempt = attempt, - problem = problem, - onEditAttempt = { attemptToEdit -> - showEditAttemptDialog = attemptToEdit - }, - onDeleteAttempt = { attemptToDelete -> - viewModel.deleteAttempt(attemptToDelete) - }, - onAttemptClick = { onNavigateToProblemDetail(problem.id) } + attempt = attempt, + problem = problem, + onEditAttempt = { attemptToEdit -> + showEditAttemptDialog = attemptToEdit + }, + onDeleteAttempt = { attemptToDelete -> + viewModel.deleteAttempt(attemptToDelete) + }, + onAttemptClick = { onNavigateToProblemDetail(problem.id) }, ) } } @@ -462,61 +472,61 @@ fun SessionDetailScreen( // Delete confirmation dialog if (showDeleteDialog) { AlertDialog( - onDismissRequest = { showDeleteDialog = false }, - title = { Text("Delete Session") }, - text = { - Column { - Text("Are you sure you want to delete this session?") - Spacer(modifier = Modifier.height(8.dp)) - Text( - text = - "This will also delete all attempts associated with this session.", - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.error - ) - } - }, - confirmButton = { - TextButton( - onClick = { - session?.let { s -> - viewModel.deleteSession(s) - onNavigateBack() - } - showDeleteDialog = false - } - ) { Text("Delete", color = MaterialTheme.colorScheme.error) } - }, - dismissButton = { - TextButton(onClick = { showDeleteDialog = false }) { Text("Cancel") } + onDismissRequest = { showDeleteDialog = false }, + title = { Text("Delete Session") }, + text = { + Column { + Text("Are you sure you want to delete this session?") + Spacer(modifier = Modifier.height(8.dp)) + Text( + text = + "This will also delete all attempts associated with this session.", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.error, + ) } + }, + confirmButton = { + TextButton( + onClick = { + session?.let { s -> + viewModel.deleteSession(s) + onNavigateBack() + } + showDeleteDialog = false + }, + ) { Text("Delete", color = MaterialTheme.colorScheme.error) } + }, + dismissButton = { + TextButton(onClick = { showDeleteDialog = false }) { Text("Cancel") } + }, ) } if (showAddAttemptDialog && session != null && gym != null) { EnhancedAddAttemptDialog( - session = session, - gym = gym, - problems = problems.filter { it.gymId == gym.id && it.isActive }, - onDismiss = { showAddAttemptDialog = false }, - onAttemptAdded = { attempt -> - viewModel.addAttempt(attempt) - showAddAttemptDialog = false - }, - onProblemCreated = { problem -> viewModel.addProblem(problem) } + session = session, + gym = gym, + problems = problems.filter { it.gymId == gym.id && it.isActive }, + onDismiss = { showAddAttemptDialog = false }, + onAttemptAdded = { attempt -> + viewModel.addAttempt(attempt) + showAddAttemptDialog = false + }, + onProblemCreated = { problem -> viewModel.addProblem(problem) }, ) } // Edit attempt dialog showEditAttemptDialog?.let { attempt -> EditAttemptDialog( - attempt = attempt, - problems = problems.filter { it.isActive }, - onDismiss = { showEditAttemptDialog = null }, - onAttemptUpdated = { updatedAttempt -> - viewModel.updateAttempt(updatedAttempt) - showEditAttemptDialog = null - } + attempt = attempt, + problems = problems.filter { it.isActive }, + onDismiss = { showEditAttemptDialog = null }, + onAttemptUpdated = { updatedAttempt -> + viewModel.updateAttempt(updatedAttempt) + showEditAttemptDialog = null + }, ) } } @@ -524,12 +534,11 @@ fun SessionDetailScreen( @OptIn(ExperimentalMaterial3Api::class) @Composable fun ProblemDetailScreen( - problemId: String, - viewModel: ClimbViewModel, - onNavigateBack: () -> Unit, - onNavigateToEdit: (String) -> Unit + problemId: String, + viewModel: ClimbViewModel, + onNavigateBack: () -> Unit, + onNavigateToEdit: (String) -> Unit, ) { - var showDeleteDialog by remember { mutableStateOf(false) } var showImageViewer by remember { mutableStateOf(false) } var selectedImageIndex by remember { mutableIntStateOf(0) } @@ -546,76 +555,76 @@ fun ProblemDetailScreen( // Calculate stats val successfulAttempts = - attempts.filter { it.result in listOf(AttemptResult.SUCCESS, AttemptResult.FLASH) } + attempts.filter { it.result in listOf(AttemptResult.SUCCESS, AttemptResult.FLASH) } val attemptsWithSessions = - attempts - .mapNotNull { attempt -> - val session = sessions.find { it.id == attempt.sessionId } - if (session != null) attempt to session else null - } - .sortedByDescending { it.second.date } + attempts + .mapNotNull { attempt -> + val session = sessions.find { it.id == attempt.sessionId } + if (session != null) attempt to session else null + } + .sortedByDescending { it.second.date } Scaffold( - topBar = { - TopAppBar( - title = { Text("Problem Details") }, - navigationIcon = { - IconButton(onClick = onNavigateBack) { - Icon( - Icons.AutoMirrored.Filled.ArrowBack, - contentDescription = "Back" - ) - } - }, - actions = { - IconButton(onClick = { showDeleteDialog = true }) { - Icon(Icons.Default.Delete, contentDescription = "Delete") - } - IconButton(onClick = { onNavigateToEdit(problemId) }) { - Icon(Icons.Default.Edit, contentDescription = "Edit") - } - } - ) - } + topBar = { + TopAppBar( + title = { Text("Problem Details") }, + navigationIcon = { + IconButton(onClick = onNavigateBack) { + Icon( + Icons.AutoMirrored.Filled.ArrowBack, + contentDescription = "Back", + ) + } + }, + actions = { + IconButton(onClick = { showDeleteDialog = true }) { + Icon(Icons.Default.Delete, contentDescription = "Delete") + } + IconButton(onClick = { onNavigateToEdit(problemId) }) { + Icon(Icons.Default.Edit, contentDescription = "Edit") + } + }, + ) + }, ) { paddingValues -> LazyColumn( - modifier = Modifier.fillMaxSize().padding(paddingValues).padding(16.dp), - verticalArrangement = Arrangement.spacedBy(16.dp) + modifier = Modifier.fillMaxSize().padding(paddingValues).padding(16.dp), + verticalArrangement = Arrangement.spacedBy(16.dp), ) { // Problem Header item { Card(modifier = Modifier.fillMaxWidth()) { Column(modifier = Modifier.padding(20.dp)) { Text( - text = problem?.name ?: "Unknown Problem", - style = MaterialTheme.typography.headlineMedium, - fontWeight = FontWeight.Bold + text = problem?.name ?: "Unknown Problem", + style = MaterialTheme.typography.headlineMedium, + fontWeight = FontWeight.Bold, ) Spacer(modifier = Modifier.height(8.dp)) Row( - modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.SpaceBetween, - verticalAlignment = Alignment.CenterVertically + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically, ) { Column { problem?.let { p -> Text( - text = - "${p.difficulty.system.displayName}: ${p.difficulty.grade}", - style = MaterialTheme.typography.titleLarge, - color = MaterialTheme.colorScheme.primary, - fontWeight = FontWeight.Bold + text = + "${p.difficulty.system.displayName}: ${p.difficulty.grade}", + style = MaterialTheme.typography.titleLarge, + color = MaterialTheme.colorScheme.primary, + fontWeight = FontWeight.Bold, ) } problem?.let { p -> Text( - text = p.climbType.displayName, - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant + text = p.climbType.displayName, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } } @@ -623,16 +632,16 @@ fun ProblemDetailScreen( gym?.let { g -> Column(horizontalAlignment = Alignment.End) { Text( - text = g.name, - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.Medium + text = g.name, + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Medium, ) problem?.location?.let { location -> Text( - text = location, - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant + text = location, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } } @@ -649,12 +658,12 @@ fun ProblemDetailScreen( if (p.imagePaths.isNotEmpty()) { Spacer(modifier = Modifier.height(16.dp)) ImageDisplaySection( - imagePaths = p.imagePaths, - title = "Photos", - onImageClick = { index -> - selectedImageIndex = index - showImageViewer = true - } + imagePaths = p.imagePaths, + title = "Photos", + onImageClick = { index -> + selectedImageIndex = index + showImageViewer = true + }, ) } } @@ -671,9 +680,9 @@ fun ProblemDetailScreen( problem?.notes?.let { notes -> Spacer(modifier = Modifier.height(12.dp)) Text( - text = notes, - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant + text = notes, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } } @@ -685,28 +694,28 @@ fun ProblemDetailScreen( Card(modifier = Modifier.fillMaxWidth()) { Column(modifier = Modifier.padding(20.dp)) { Text( - text = "Progress Summary", - style = MaterialTheme.typography.titleLarge, - fontWeight = FontWeight.Bold + text = "Progress Summary", + style = MaterialTheme.typography.titleLarge, + fontWeight = FontWeight.Bold, ) Spacer(modifier = Modifier.height(16.dp)) if (attempts.isEmpty()) { Text( - text = "No attempts recorded yet", - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant + text = "No attempts recorded yet", + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } else { Row( - modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.SpaceEvenly + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceEvenly, ) { StatItem(label = "Total Attempts", value = attempts.size.toString()) StatItem( - label = "Successful", - value = successfulAttempts.size.toString() + label = "Successful", + value = successfulAttempts.size.toString(), ) } @@ -714,16 +723,16 @@ fun ProblemDetailScreen( if (successfulAttempts.isNotEmpty()) { val firstSuccess = - successfulAttempts.minByOrNull { attempt -> - sessions.find { it.id == attempt.sessionId }?.date ?: "" - } + successfulAttempts.minByOrNull { attempt -> + sessions.find { it.id == attempt.sessionId }?.date ?: "" + } firstSuccess?.let { attempt -> val session = sessions.find { it.id == attempt.sessionId } Text( - text = - "First success: ${formatDate(session?.date ?: "")} (${attempt.result.name.lowercase().replaceFirstChar { it.uppercase() }})", - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.primary + text = + "First success: ${formatDate(session?.date ?: "")} (${attempt.result.name.lowercase().replaceFirstChar { it.uppercase() }})", + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.primary, ) } } @@ -735,9 +744,9 @@ fun ProblemDetailScreen( // Attempt History item { Text( - text = "Attempt History (${attempts.size})", - style = MaterialTheme.typography.titleLarge, - fontWeight = FontWeight.Bold + text = "Attempt History (${attempts.size})", + style = MaterialTheme.typography.titleLarge, + fontWeight = FontWeight.Bold, ) } @@ -745,20 +754,20 @@ fun ProblemDetailScreen( item { Card(modifier = Modifier.fillMaxWidth()) { Column( - modifier = Modifier.fillMaxWidth().padding(20.dp), - horizontalAlignment = Alignment.CenterHorizontally + modifier = Modifier.fillMaxWidth().padding(20.dp), + horizontalAlignment = Alignment.CenterHorizontally, ) { Text( - text = "No attempts yet", - style = MaterialTheme.typography.titleMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant + text = "No attempts yet", + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) Spacer(modifier = Modifier.height(8.dp)) Text( - text = - "Start a session and track your attempts on this problem!", - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant + text = + "Start a session and track your attempts on this problem!", + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } } @@ -775,34 +784,34 @@ fun ProblemDetailScreen( // Delete confirmation dialog if (showDeleteDialog) { AlertDialog( - onDismissRequest = { showDeleteDialog = false }, - title = { Text("Delete Problem") }, - text = { - Column { - Text("Are you sure you want to delete this problem?") - Spacer(modifier = Modifier.height(8.dp)) - Text( - text = - "This will also delete all attempts associated with this problem.", - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.error - ) - } - }, - confirmButton = { - TextButton( - onClick = { - problem?.let { p -> - viewModel.deleteProblem(p) - onNavigateBack() - } - showDeleteDialog = false - } - ) { Text("Delete", color = MaterialTheme.colorScheme.error) } - }, - dismissButton = { - TextButton(onClick = { showDeleteDialog = false }) { Text("Cancel") } + onDismissRequest = { showDeleteDialog = false }, + title = { Text("Delete Problem") }, + text = { + Column { + Text("Are you sure you want to delete this problem?") + Spacer(modifier = Modifier.height(8.dp)) + Text( + text = + "This will also delete all attempts associated with this problem.", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.error, + ) } + }, + confirmButton = { + TextButton( + onClick = { + problem?.let { p -> + viewModel.deleteProblem(p) + onNavigateBack() + } + showDeleteDialog = false + }, + ) { Text("Delete", color = MaterialTheme.colorScheme.error) } + }, + dismissButton = { + TextButton(onClick = { showDeleteDialog = false }) { Text("Cancel") } + }, ) } @@ -810,9 +819,9 @@ fun ProblemDetailScreen( problem?.let { p -> if (showImageViewer && p.imagePaths.isNotEmpty()) { FullscreenImageViewer( - imagePaths = p.imagePaths, - initialIndex = selectedImageIndex, - onDismiss = { showImageViewer = false } + imagePaths = p.imagePaths, + initialIndex = selectedImageIndex, + onDismiss = { showImageViewer = false }, ) } } @@ -821,12 +830,12 @@ fun ProblemDetailScreen( @OptIn(ExperimentalMaterial3Api::class) @Composable fun GymDetailScreen( - gymId: String, - viewModel: ClimbViewModel, - onNavigateBack: () -> Unit, - onNavigateToEdit: (String) -> Unit, - onNavigateToSessionDetail: (String) -> Unit = {}, - onNavigateToProblemDetail: (String) -> Unit = {} + gymId: String, + viewModel: ClimbViewModel, + onNavigateBack: () -> Unit, + onNavigateToEdit: (String) -> Unit, + onNavigateToSessionDetail: (String) -> Unit = {}, + onNavigateToProblemDetail: (String) -> Unit = {}, ) { val gyms by viewModel.gyms.collectAsState() val gym = gyms.find { it.id == gymId } @@ -836,9 +845,9 @@ fun GymDetailScreen( // Calculate statistics val gymAttempts = - allAttempts.filter { attempt -> - problems.any { problem -> problem.id == attempt.problemId } - } + allAttempts.filter { attempt -> + problems.any { problem -> problem.id == attempt.problemId } + } val uniqueProblemsClimbed = gymAttempts.map { it.problemId }.toSet().size val totalSessions = sessions.size @@ -847,54 +856,54 @@ fun GymDetailScreen( var showDeleteDialog by remember { mutableStateOf(false) } Scaffold( - topBar = { - TopAppBar( - title = { Text(gym?.name ?: "Gym Details") }, - navigationIcon = { - IconButton(onClick = onNavigateBack) { - Icon( - Icons.AutoMirrored.Filled.ArrowBack, - contentDescription = "Back" - ) - } - }, - actions = { - IconButton(onClick = { showDeleteDialog = true }) { - Icon(Icons.Default.Delete, contentDescription = "Delete") - } - IconButton(onClick = { onNavigateToEdit(gymId) }) { - Icon(Icons.Default.Edit, contentDescription = "Edit") - } - } - ) - } + topBar = { + TopAppBar( + title = { Text(gym?.name ?: "Gym Details") }, + navigationIcon = { + IconButton(onClick = onNavigateBack) { + Icon( + Icons.AutoMirrored.Filled.ArrowBack, + contentDescription = "Back", + ) + } + }, + actions = { + IconButton(onClick = { showDeleteDialog = true }) { + Icon(Icons.Default.Delete, contentDescription = "Delete") + } + IconButton(onClick = { onNavigateToEdit(gymId) }) { + Icon(Icons.Default.Edit, contentDescription = "Edit") + } + }, + ) + }, ) { paddingValues -> if (gym == null) { Box( - modifier = Modifier.fillMaxSize().padding(paddingValues), - contentAlignment = Alignment.Center + modifier = Modifier.fillMaxSize().padding(paddingValues), + contentAlignment = Alignment.Center, ) { Text("Gym not found") } } else { LazyColumn( - modifier = Modifier.fillMaxSize().padding(paddingValues).padding(16.dp), - verticalArrangement = Arrangement.spacedBy(16.dp) + modifier = Modifier.fillMaxSize().padding(paddingValues).padding(16.dp), + verticalArrangement = Arrangement.spacedBy(16.dp), ) { // Gym Information Card item { Card(modifier = Modifier.fillMaxWidth(), shape = RoundedCornerShape(16.dp)) { Column(modifier = Modifier.padding(20.dp)) { Text( - text = gym.name, - style = MaterialTheme.typography.headlineMedium, - fontWeight = FontWeight.Bold + text = gym.name, + style = MaterialTheme.typography.headlineMedium, + fontWeight = FontWeight.Bold, ) if (gym.location?.isNotBlank() == true) { Spacer(modifier = Modifier.height(4.dp)) Text( - text = gym.location, - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant + text = gym.location, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } @@ -911,42 +920,42 @@ fun GymDetailScreen( Card(modifier = Modifier.fillMaxWidth(), shape = RoundedCornerShape(16.dp)) { Column(modifier = Modifier.padding(20.dp)) { Text( - text = "Statistics", - style = MaterialTheme.typography.titleLarge, - fontWeight = FontWeight.Bold + text = "Statistics", + style = MaterialTheme.typography.titleLarge, + fontWeight = FontWeight.Bold, ) Spacer(modifier = Modifier.height(16.dp)) // Statistics Grid Row( - modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.SpaceEvenly + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceEvenly, ) { Column(horizontalAlignment = Alignment.CenterHorizontally) { Text( - text = problems.size.toString(), - style = MaterialTheme.typography.headlineSmall, - fontWeight = FontWeight.Bold, - color = MaterialTheme.colorScheme.primary + text = problems.size.toString(), + style = MaterialTheme.typography.headlineSmall, + fontWeight = FontWeight.Bold, + color = MaterialTheme.colorScheme.primary, ) Text( - text = "Problems", - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant + text = "Problems", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } Column(horizontalAlignment = Alignment.CenterHorizontally) { Text( - text = totalSessions.toString(), - style = MaterialTheme.typography.headlineSmall, - fontWeight = FontWeight.Bold, - color = MaterialTheme.colorScheme.primary + text = totalSessions.toString(), + style = MaterialTheme.typography.headlineSmall, + fontWeight = FontWeight.Bold, + color = MaterialTheme.colorScheme.primary, ) Text( - text = "Sessions", - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant + text = "Sessions", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } } @@ -954,47 +963,47 @@ fun GymDetailScreen( Spacer(modifier = Modifier.height(12.dp)) Row( - modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.SpaceEvenly + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceEvenly, ) { Column(horizontalAlignment = Alignment.CenterHorizontally) { Text( - text = gymAttempts.size.toString(), - style = MaterialTheme.typography.headlineSmall, - fontWeight = FontWeight.Bold, - color = MaterialTheme.colorScheme.primary + text = gymAttempts.size.toString(), + style = MaterialTheme.typography.headlineSmall, + fontWeight = FontWeight.Bold, + color = MaterialTheme.colorScheme.primary, ) Text( - text = "Total Attempts", - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant + text = "Total Attempts", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } Column(horizontalAlignment = Alignment.CenterHorizontally) { Text( - text = uniqueProblemsClimbed.toString(), - style = MaterialTheme.typography.headlineSmall, - fontWeight = FontWeight.Bold, - color = MaterialTheme.colorScheme.primary + text = uniqueProblemsClimbed.toString(), + style = MaterialTheme.typography.headlineSmall, + fontWeight = FontWeight.Bold, + color = MaterialTheme.colorScheme.primary, ) Text( - text = "Problems Climbed", - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant + text = "Problems Climbed", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } if (activeSessions > 0) { Column(horizontalAlignment = Alignment.CenterHorizontally) { Text( - text = activeSessions.toString(), - style = MaterialTheme.typography.headlineSmall, - fontWeight = FontWeight.Bold, - color = MaterialTheme.colorScheme.primary + text = activeSessions.toString(), + style = MaterialTheme.typography.headlineSmall, + fontWeight = FontWeight.Bold, + color = MaterialTheme.colorScheme.primary, ) Text( - text = "Active Sessions", - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant + text = "Active Sessions", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } } @@ -1007,14 +1016,14 @@ fun GymDetailScreen( if (problems.isNotEmpty()) { item { Card( - modifier = Modifier.fillMaxWidth(), - shape = RoundedCornerShape(16.dp) + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(16.dp), ) { Column(modifier = Modifier.padding(20.dp)) { Text( - text = "Problems (${problems.size})", - style = MaterialTheme.typography.titleLarge, - fontWeight = FontWeight.Bold + text = "Problems (${problems.size})", + style = MaterialTheme.typography.titleLarge, + fontWeight = FontWeight.Bold, ) Spacer(modifier = Modifier.height(12.dp)) @@ -1023,61 +1032,61 @@ fun GymDetailScreen( problems.sortedByDescending { it.createdAt }.take(5).forEach { problem -> val problemAttempts = - gymAttempts.filter { it.problemId == problem.id } + gymAttempts.filter { it.problemId == problem.id } val problemSuccessful = - problemAttempts.any { - it.result in - listOf( - AttemptResult.SUCCESS, - AttemptResult.FLASH - ) - } + problemAttempts.any { + it.result in + listOf( + AttemptResult.SUCCESS, + AttemptResult.FLASH, + ) + } Card( - modifier = - Modifier.fillMaxWidth() - .padding(vertical = 4.dp) - .clickable { - onNavigateToProblemDetail( - problem.id - ) - }, - colors = - CardDefaults.cardColors( - containerColor = - MaterialTheme.colorScheme - .surface - ), - shape = RoundedCornerShape(12.dp), - elevation = - CardDefaults.cardElevation( - defaultElevation = 4.dp - ) + modifier = + Modifier.fillMaxWidth() + .padding(vertical = 4.dp) + .clickable { + onNavigateToProblemDetail( + problem.id, + ) + }, + colors = + CardDefaults.cardColors( + containerColor = + MaterialTheme.colorScheme + .surface, + ), + shape = RoundedCornerShape(12.dp), + elevation = + CardDefaults.cardElevation( + defaultElevation = 4.dp, + ), ) { ListItem( - headlineContent = { - Text( - text = problem.name - ?: "Unnamed Problem", - fontWeight = FontWeight.Medium + headlineContent = { + Text( + text = problem.name + ?: "Unnamed Problem", + fontWeight = FontWeight.Medium, + ) + }, + supportingContent = { + Text( + "${problem.difficulty.grade} • ${problem.climbType} • ${problemAttempts.size} attempts", + ) + }, + trailingContent = { + if (problemSuccessful) { + Icon( + Icons.Default.Check, + contentDescription = "Completed", + tint = + MaterialTheme.colorScheme + .primary, ) - }, - supportingContent = { - Text( - "${problem.difficulty.grade} • ${problem.climbType} • ${problemAttempts.size} attempts" - ) - }, - trailingContent = { - if (problemSuccessful) { - Icon( - Icons.Default.Check, - contentDescription = "Completed", - tint = - MaterialTheme.colorScheme - .primary - ) - } } + }, ) } } @@ -1085,9 +1094,9 @@ fun GymDetailScreen( if (problems.size > 5) { Spacer(modifier = Modifier.height(8.dp)) Text( - text = "... and ${problems.size - 5} more problems", - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant + text = "... and ${problems.size - 5} more problems", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } } @@ -1099,14 +1108,14 @@ fun GymDetailScreen( if (sessions.isNotEmpty()) { item { Card( - modifier = Modifier.fillMaxWidth(), - shape = RoundedCornerShape(16.dp) + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(16.dp), ) { Column(modifier = Modifier.padding(20.dp)) { Text( - text = "Recent Sessions (${sessions.size})", - style = MaterialTheme.typography.titleLarge, - fontWeight = FontWeight.Bold + text = "Recent Sessions (${sessions.size})", + style = MaterialTheme.typography.titleLarge, + fontWeight = FontWeight.Bold, ) Spacer(modifier = Modifier.height(12.dp)) @@ -1114,89 +1123,91 @@ fun GymDetailScreen( // Show recent sessions (limit to 3) sessions.sortedByDescending { it.date }.take(3).forEach { session -> val sessionAttempts = - gymAttempts.filter { it.sessionId == session.id } + gymAttempts.filter { it.sessionId == session.id } Card( - modifier = - Modifier.fillMaxWidth() - .padding(vertical = 4.dp) - .clickable { - onNavigateToSessionDetail( - session.id - ) - }, - colors = - CardDefaults.cardColors( - containerColor = - MaterialTheme.colorScheme - .surface - ), - shape = RoundedCornerShape(12.dp), - elevation = - CardDefaults.cardElevation( - defaultElevation = 4.dp - ) + modifier = + Modifier.fillMaxWidth() + .padding(vertical = 4.dp) + .clickable { + onNavigateToSessionDetail( + session.id, + ) + }, + colors = + CardDefaults.cardColors( + containerColor = + MaterialTheme.colorScheme + .surface, + ), + shape = RoundedCornerShape(12.dp), + elevation = + CardDefaults.cardElevation( + defaultElevation = 4.dp, + ), ) { ListItem( - headlineContent = { - Row( - horizontalArrangement = - Arrangement.spacedBy(8.dp), - verticalAlignment = - Alignment.CenterVertically - ) { - Text( - text = - if (session.status == - SessionStatus - .ACTIVE - ) - "Active Session" - else "Session", - fontWeight = FontWeight.Medium - ) - if (session.status == SessionStatus.ACTIVE + headlineContent = { + Row( + horizontalArrangement = + Arrangement.spacedBy(8.dp), + verticalAlignment = + Alignment.CenterVertically, + ) { + Text( + text = + if (session.status == + SessionStatus + .ACTIVE ) { - Badge( - containerColor = - MaterialTheme - .colorScheme - .primary - ) { - Text( - "ACTIVE", - style = - MaterialTheme - .typography - .labelSmall - ) - } + "Active Session" + } else { + "Session" + }, + fontWeight = FontWeight.Medium, + ) + if (session.status == SessionStatus.ACTIVE + ) { + Badge( + containerColor = + MaterialTheme + .colorScheme + .primary, + ) { + Text( + "ACTIVE", + style = + MaterialTheme + .typography + .labelSmall, + ) } } - }, - supportingContent = { - val formattedDate = - DateFormatUtils.formatDateForDisplay( - session.date - ) - - Text( - "$formattedDate • ${sessionAttempts.size} attempts" - ) - }, - trailingContent = { - session.duration?.let { duration -> - Text( - text = "${duration}min", - style = - MaterialTheme.typography - .bodySmall, - color = - MaterialTheme.colorScheme - .onSurfaceVariant - ) - } } + }, + supportingContent = { + val formattedDate = + DateFormatUtils.formatDateForDisplay( + session.date, + ) + + Text( + "$formattedDate • ${sessionAttempts.size} attempts", + ) + }, + trailingContent = { + session.duration?.let { duration -> + Text( + text = "${duration}min", + style = + MaterialTheme.typography + .bodySmall, + color = + MaterialTheme.colorScheme + .onSurfaceVariant, + ) + } + }, ) } } @@ -1204,9 +1215,9 @@ fun GymDetailScreen( if (sessions.size > 3) { Spacer(modifier = Modifier.height(8.dp)) Text( - text = "... and ${sessions.size - 3} more sessions", - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant + text = "... and ${sessions.size - 3} more sessions", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } } @@ -1218,23 +1229,23 @@ fun GymDetailScreen( if (problems.isEmpty() && sessions.isEmpty()) { item { Card( - modifier = Modifier.fillMaxWidth(), - shape = RoundedCornerShape(16.dp) + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(16.dp), ) { Column( - modifier = Modifier.fillMaxWidth().padding(40.dp), - horizontalAlignment = Alignment.CenterHorizontally + modifier = Modifier.fillMaxWidth().padding(40.dp), + horizontalAlignment = Alignment.CenterHorizontally, ) { Text( - text = "No activity yet", - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.Medium + text = "No activity yet", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Medium, ) Spacer(modifier = Modifier.height(8.dp)) Text( - text = "Start a session or add problems to see them here", - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant + text = "Start a session or add problems to see them here", + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } } @@ -1247,34 +1258,34 @@ fun GymDetailScreen( // Delete confirmation dialog if (showDeleteDialog) { AlertDialog( - onDismissRequest = { showDeleteDialog = false }, - title = { Text("Delete Gym") }, - text = { - Column { - Text("Are you sure you want to delete this gym?") - Spacer(modifier = Modifier.height(8.dp)) - Text( - text = - "This will also delete all problems and sessions associated with this gym.", - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.error - ) - } - }, - confirmButton = { - TextButton( - onClick = { - gym?.let { g -> - viewModel.deleteGym(g) - onNavigateBack() - } - showDeleteDialog = false - } - ) { Text("Delete", color = MaterialTheme.colorScheme.error) } - }, - dismissButton = { - TextButton(onClick = { showDeleteDialog = false }) { Text("Cancel") } + onDismissRequest = { showDeleteDialog = false }, + title = { Text("Delete Gym") }, + text = { + Column { + Text("Are you sure you want to delete this gym?") + Spacer(modifier = Modifier.height(8.dp)) + Text( + text = + "This will also delete all problems and sessions associated with this gym.", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.error, + ) } + }, + confirmButton = { + TextButton( + onClick = { + gym?.let { g -> + viewModel.deleteGym(g) + onNavigateBack() + } + showDeleteDialog = false + }, + ) { Text("Delete", color = MaterialTheme.colorScheme.error) } + }, + dismissButton = { + TextButton(onClick = { showDeleteDialog = false }) { Text("Cancel") } + }, ) } } @@ -1283,15 +1294,15 @@ fun GymDetailScreen( fun StatItem(label: String, value: String) { Column(horizontalAlignment = Alignment.CenterHorizontally) { Text( - text = value, - style = MaterialTheme.typography.headlineSmall, - fontWeight = FontWeight.Bold, - color = MaterialTheme.colorScheme.primary + text = value, + style = MaterialTheme.typography.headlineSmall, + fontWeight = FontWeight.Bold, + color = MaterialTheme.colorScheme.primary, ) Text( - text = label, - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant + text = label, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } } @@ -1301,21 +1312,21 @@ fun AttemptHistoryCard(attempt: Attempt, session: ClimbSession, gym: Gym?) { Card(modifier = Modifier.fillMaxWidth()) { Column(modifier = Modifier.padding(16.dp)) { Row( - modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.SpaceBetween, - verticalAlignment = Alignment.CenterVertically + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically, ) { Column { Text( - text = formatDate(session.date), - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.Medium + text = formatDate(session.date), + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Medium, ) gym?.let { g -> Text( - text = g.name, - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant + text = g.name, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } } @@ -1334,106 +1345,106 @@ fun AttemptHistoryCard(attempt: Attempt, session: ClimbSession, gym: Gym?) { @Composable fun AttemptResultBadge(result: AttemptResult) { val backgroundColor = - when (result) { - AttemptResult.SUCCESS, AttemptResult.FLASH -> - MaterialTheme.colorScheme.primaryContainer - AttemptResult.FALL -> MaterialTheme.colorScheme.secondaryContainer - else -> MaterialTheme.colorScheme.surfaceVariant - } + when (result) { + AttemptResult.SUCCESS, AttemptResult.FLASH -> + MaterialTheme.colorScheme.primaryContainer + AttemptResult.FALL -> MaterialTheme.colorScheme.secondaryContainer + else -> MaterialTheme.colorScheme.surfaceVariant + } val textColor = - when (result) { - AttemptResult.SUCCESS, AttemptResult.FLASH -> - MaterialTheme.colorScheme.onPrimaryContainer - AttemptResult.FALL -> MaterialTheme.colorScheme.onSecondaryContainer - else -> MaterialTheme.colorScheme.onSurfaceVariant - } + when (result) { + AttemptResult.SUCCESS, AttemptResult.FLASH -> + MaterialTheme.colorScheme.onPrimaryContainer + AttemptResult.FALL -> MaterialTheme.colorScheme.onSecondaryContainer + else -> MaterialTheme.colorScheme.onSurfaceVariant + } Surface(color = backgroundColor, shape = RoundedCornerShape(12.dp)) { Text( - text = - when (result) { - AttemptResult.NO_PROGRESS -> "No Progress" - else -> result.name.lowercase().replaceFirstChar { it.uppercase() } - }, - modifier = Modifier.padding(horizontal = 12.dp, vertical = 6.dp), - style = MaterialTheme.typography.labelMedium, - color = textColor, - fontWeight = FontWeight.Medium + text = + when (result) { + AttemptResult.NO_PROGRESS -> "No Progress" + else -> result.name.lowercase().replaceFirstChar { it.uppercase() } + }, + modifier = Modifier.padding(horizontal = 12.dp, vertical = 6.dp), + style = MaterialTheme.typography.labelMedium, + color = textColor, + fontWeight = FontWeight.Medium, ) } } @Composable fun SessionAttemptCard( - attempt: Attempt, - problem: Problem, - onEditAttempt: (Attempt) -> Unit = {}, - onDeleteAttempt: (Attempt) -> Unit = {}, - onAttemptClick: () -> Unit = {} + attempt: Attempt, + problem: Problem, + onEditAttempt: (Attempt) -> Unit = {}, + onDeleteAttempt: (Attempt) -> Unit = {}, + onAttemptClick: () -> Unit = {}, ) { var showDeleteDialog by remember { mutableStateOf(false) } Card( - modifier = Modifier.fillMaxWidth().clickable { onAttemptClick() }, - elevation = CardDefaults.cardElevation(defaultElevation = 2.dp) + modifier = Modifier.fillMaxWidth().clickable { onAttemptClick() }, + elevation = CardDefaults.cardElevation(defaultElevation = 2.dp), ) { Column(modifier = Modifier.padding(16.dp)) { Row( - modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.SpaceBetween, - verticalAlignment = Alignment.CenterVertically + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically, ) { Column(modifier = Modifier.weight(1f)) { Text( - text = problem.name ?: "Unknown Problem", - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.Medium + text = problem.name ?: "Unknown Problem", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Medium, ) Text( - text = - "${problem.difficulty.system.displayName}: ${problem.difficulty.grade}", - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.primary + text = + "${problem.difficulty.system.displayName}: ${problem.difficulty.grade}", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.primary, ) problem.location?.let { location -> Text( - text = location, - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant + text = location, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } } Row( - horizontalArrangement = Arrangement.spacedBy(8.dp), - verticalAlignment = Alignment.CenterVertically + horizontalArrangement = Arrangement.spacedBy(8.dp), + verticalAlignment = Alignment.CenterVertically, ) { AttemptResultBadge(result = attempt.result) // Edit button IconButton( - onClick = { onEditAttempt(attempt) }, - modifier = Modifier.size(32.dp) + onClick = { onEditAttempt(attempt) }, + modifier = Modifier.size(32.dp), ) { Icon( - Icons.Default.Edit, - contentDescription = "Edit attempt", - modifier = Modifier.size(16.dp) + Icons.Default.Edit, + contentDescription = "Edit attempt", + modifier = Modifier.size(16.dp), ) } // Delete button IconButton( - onClick = { showDeleteDialog = true }, - modifier = Modifier.size(32.dp) + onClick = { showDeleteDialog = true }, + modifier = Modifier.size(32.dp), ) { Icon( - Icons.Default.Delete, - contentDescription = "Delete attempt", - modifier = Modifier.size(16.dp) + Icons.Default.Delete, + contentDescription = "Delete attempt", + modifier = Modifier.size(16.dp), ) } } @@ -1449,20 +1460,20 @@ fun SessionAttemptCard( // Delete confirmation dialog if (showDeleteDialog) { AlertDialog( - onDismissRequest = { showDeleteDialog = false }, - title = { Text("Delete Attempt") }, - text = { Text("Are you sure you want to delete this attempt?") }, - confirmButton = { - TextButton( - onClick = { - onDeleteAttempt(attempt) - showDeleteDialog = false - } - ) { Text("Delete", color = MaterialTheme.colorScheme.error) } - }, - dismissButton = { - TextButton(onClick = { showDeleteDialog = false }) { Text("Cancel") } - } + onDismissRequest = { showDeleteDialog = false }, + title = { Text("Delete Attempt") }, + text = { Text("Are you sure you want to delete this attempt?") }, + confirmButton = { + TextButton( + onClick = { + onDeleteAttempt(attempt) + showDeleteDialog = false + }, + ) { Text("Delete", color = MaterialTheme.colorScheme.error) } + }, + dismissButton = { + TextButton(onClick = { showDeleteDialog = false }) { Text("Cancel") } + }, ) } } @@ -1474,12 +1485,12 @@ private fun formatDate(dateString: String): String { @OptIn(ExperimentalMaterial3Api::class) @Composable fun EnhancedAddAttemptDialog( - session: ClimbSession, - gym: Gym, - problems: List, - onDismiss: () -> Unit, - onAttemptAdded: (Attempt) -> Unit, - onProblemCreated: (Problem) -> Unit + session: ClimbSession, + gym: Gym, + problems: List, + onDismiss: () -> Unit, + onAttemptAdded: (Attempt) -> Unit, + onProblemCreated: (Problem) -> Unit, ) { var selectedProblem by remember { mutableStateOf(null) } var selectedResult by remember { mutableStateOf(AttemptResult.FALL) } @@ -1499,7 +1510,7 @@ fun EnhancedAddAttemptDialog( // Auto-select climb type if there's only one available LaunchedEffect(gym.supportedClimbTypes) { if (gym.supportedClimbTypes.size == 1 && - selectedClimbType != gym.supportedClimbTypes.first() + selectedClimbType != gym.supportedClimbTypes.first() ) { selectedClimbType = gym.supportedClimbTypes.first() } @@ -1508,16 +1519,16 @@ fun EnhancedAddAttemptDialog( // Auto-select difficulty system if there's only one available for the selected climb type LaunchedEffect(selectedClimbType, gym.difficultySystems) { val availableSystems = - DifficultySystem.systemsForClimbType(selectedClimbType).filter { system -> - gym.difficultySystems.contains(system) - } + DifficultySystem.systemsForClimbType(selectedClimbType).filter { system -> + gym.difficultySystems.contains(system) + } when { // If current system is not compatible, select the first available one selectedDifficultySystem !in availableSystems -> { selectedDifficultySystem = - availableSystems.firstOrNull() - ?: gym.difficultySystems.firstOrNull() ?: DifficultySystem.CUSTOM + availableSystems.firstOrNull() + ?: gym.difficultySystems.firstOrNull() ?: DifficultySystem.CUSTOM } // If there's only one available system, auto-select it availableSystems.size == 1 && selectedDifficultySystem != availableSystems.first() -> { @@ -1537,52 +1548,52 @@ fun EnhancedAddAttemptDialog( Dialog(onDismissRequest = onDismiss) { Card(modifier = Modifier.fillMaxWidth(0.95f).fillMaxHeight(0.9f).padding(16.dp)) { Column( - modifier = Modifier.fillMaxSize().padding(24.dp), - verticalArrangement = Arrangement.spacedBy(20.dp) + modifier = Modifier.fillMaxSize().padding(24.dp), + verticalArrangement = Arrangement.spacedBy(20.dp), ) { Text( - text = "Add Attempt", - style = MaterialTheme.typography.headlineSmall, - fontWeight = FontWeight.Bold, - modifier = Modifier.padding(bottom = 20.dp) + text = "Add Attempt", + style = MaterialTheme.typography.headlineSmall, + fontWeight = FontWeight.Bold, + modifier = Modifier.padding(bottom = 20.dp), ) LazyColumn( - modifier = Modifier.weight(1f).fillMaxWidth(), - verticalArrangement = Arrangement.spacedBy(20.dp) + modifier = Modifier.weight(1f).fillMaxWidth(), + verticalArrangement = Arrangement.spacedBy(20.dp), ) { item { if (!showCreateProblem) { Column(verticalArrangement = Arrangement.spacedBy(12.dp)) { Text( - text = "Select Problem", - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.SemiBold, - color = MaterialTheme.colorScheme.onSurface + text = "Select Problem", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.SemiBold, + color = MaterialTheme.colorScheme.onSurface, ) if (problems.isEmpty()) { Card( - colors = - CardDefaults.cardColors( - containerColor = - MaterialTheme.colorScheme - .surfaceVariant.copy( - alpha = 0.5f - ) - ), - modifier = Modifier.fillMaxWidth() + colors = + CardDefaults.cardColors( + containerColor = + MaterialTheme.colorScheme + .surfaceVariant.copy( + alpha = 0.5f, + ), + ), + modifier = Modifier.fillMaxWidth(), ) { Column( - modifier = Modifier.padding(16.dp).fillMaxWidth(), - horizontalAlignment = Alignment.CenterHorizontally + modifier = Modifier.padding(16.dp).fillMaxWidth(), + horizontalAlignment = Alignment.CenterHorizontally, ) { Text( - text = "No active problems in this gym", - style = MaterialTheme.typography.bodyMedium, - color = - MaterialTheme.colorScheme - .onSurfaceVariant + text = "No active problems in this gym", + style = MaterialTheme.typography.bodyMedium, + color = + MaterialTheme.colorScheme + .onSurfaceVariant, ) Spacer(modifier = Modifier.height(8.dp)) @@ -1594,77 +1605,82 @@ fun EnhancedAddAttemptDialog( } } else { LazyColumn( - modifier = Modifier.height(140.dp), - verticalArrangement = Arrangement.spacedBy(8.dp) + modifier = Modifier.height(140.dp), + verticalArrangement = Arrangement.spacedBy(8.dp), ) { items(problems) { problem -> val isSelected = selectedProblem?.id == problem.id Card( - onClick = { selectedProblem = problem }, - colors = - CardDefaults.cardColors( - containerColor = - if (isSelected) - MaterialTheme - .colorScheme - .primaryContainer - else - MaterialTheme - .colorScheme - .surfaceVariant, - ), - border = - if (isSelected) - BorderStroke( - 2.dp, - MaterialTheme - .colorScheme - .primary - ) - else null, - modifier = Modifier.fillMaxWidth() + onClick = { selectedProblem = problem }, + colors = + CardDefaults.cardColors( + containerColor = + if (isSelected) { + MaterialTheme + .colorScheme + .primaryContainer + } else { + MaterialTheme + .colorScheme + .surfaceVariant + }, + ), + border = + if (isSelected) { + BorderStroke( + 2.dp, + MaterialTheme + .colorScheme + .primary, + ) + } else { + null + }, + modifier = Modifier.fillMaxWidth(), ) { Column(modifier = Modifier.padding(16.dp)) { Text( - text = problem.name - ?: "Unnamed Problem", - style = - MaterialTheme.typography - .bodyLarge, - fontWeight = FontWeight.SemiBold, - color = - if (isSelected) - MaterialTheme - .colorScheme - .onSurface - else - MaterialTheme - .colorScheme - .onSurfaceVariant + text = problem.name + ?: "Unnamed Problem", + style = + MaterialTheme.typography + .bodyLarge, + fontWeight = FontWeight.SemiBold, + color = + if (isSelected) { + MaterialTheme + .colorScheme + .onSurface + } else { + MaterialTheme + .colorScheme + .onSurfaceVariant + }, ) Spacer(modifier = Modifier.height(4.dp)) Text( - text = - "${problem.difficulty.system.displayName}: ${problem.difficulty.grade}", - style = - MaterialTheme.typography - .bodyMedium, - color = - if (isSelected) - MaterialTheme - .colorScheme - .onSurface.copy( - alpha = 0.9f - ) - else - MaterialTheme - .colorScheme - .onSurfaceVariant - .copy( - alpha = - 0.7f - ), - fontWeight = FontWeight.Medium + text = + "${problem.difficulty.system.displayName}: ${problem.difficulty.grade}", + style = + MaterialTheme.typography + .bodyMedium, + color = + if (isSelected) { + MaterialTheme + .colorScheme + .onSurface.copy( + alpha = 0.9f, + ) + } else { + MaterialTheme + .colorScheme + .onSurfaceVariant + .copy( + alpha = + 0.7f, + ) + }, + fontWeight = FontWeight.Medium, ) } } @@ -1673,87 +1689,87 @@ fun EnhancedAddAttemptDialog( // Option to create new problem OutlinedButton( - onClick = { showCreateProblem = true }, - modifier = Modifier.fillMaxWidth() + onClick = { showCreateProblem = true }, + modifier = Modifier.fillMaxWidth(), ) { Text("Create New Problem") } } } } else { Column(verticalArrangement = Arrangement.spacedBy(16.dp)) { Row( - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.SpaceBetween, - modifier = Modifier.fillMaxWidth() + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween, + modifier = Modifier.fillMaxWidth(), ) { Text( - text = "Create New Problem", - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.SemiBold, - color = MaterialTheme.colorScheme.onSurface + text = "Create New Problem", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.SemiBold, + color = MaterialTheme.colorScheme.onSurface, ) IconButton( - onClick = { - showCreateProblem = false - newProblemName = "" - newProblemGrade = "" - newProblemImagePaths = emptyList() - } + onClick = { + showCreateProblem = false + newProblemName = "" + newProblemGrade = "" + newProblemImagePaths = emptyList() + }, ) { Icon( - Icons.AutoMirrored.Filled.ArrowBack, - contentDescription = "Back", - tint = MaterialTheme.colorScheme.onSurfaceVariant + Icons.AutoMirrored.Filled.ArrowBack, + contentDescription = "Back", + tint = MaterialTheme.colorScheme.onSurfaceVariant, ) } } OutlinedTextField( - value = newProblemName, - onValueChange = { newProblemName = it }, - label = { Text("Problem Name") }, - placeholder = { Text("e.g., 'The Red Overhang'") }, - modifier = Modifier.fillMaxWidth(), - singleLine = true, - colors = - OutlinedTextFieldDefaults.colors( - focusedBorderColor = - MaterialTheme.colorScheme.primary, - unfocusedBorderColor = - MaterialTheme.colorScheme.outline - ) + value = newProblemName, + onValueChange = { newProblemName = it }, + label = { Text("Problem Name") }, + placeholder = { Text("e.g., 'The Red Overhang'") }, + modifier = Modifier.fillMaxWidth(), + singleLine = true, + colors = + OutlinedTextFieldDefaults.colors( + focusedBorderColor = + MaterialTheme.colorScheme.primary, + unfocusedBorderColor = + MaterialTheme.colorScheme.outline, + ), ) // Climb Type Selection Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { Text( - text = "Climb Type", - style = MaterialTheme.typography.bodyLarge, - fontWeight = FontWeight.Medium, - color = MaterialTheme.colorScheme.onSurface + text = "Climb Type", + style = MaterialTheme.typography.bodyLarge, + fontWeight = FontWeight.Medium, + color = MaterialTheme.colorScheme.onSurface, ) LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) { items(gym.supportedClimbTypes) { climbType -> FilterChip( - onClick = { selectedClimbType = climbType }, - label = { - Text( - climbType.displayName, - fontWeight = FontWeight.Medium - ) - }, - selected = selectedClimbType == climbType, - colors = - FilterChipDefaults.filterChipColors( - selectedContainerColor = - MaterialTheme - .colorScheme - .primaryContainer, - selectedLabelColor = - MaterialTheme - .colorScheme - .onPrimaryContainer - ) + onClick = { selectedClimbType = climbType }, + label = { + Text( + climbType.displayName, + fontWeight = FontWeight.Medium, + ) + }, + selected = selectedClimbType == climbType, + colors = + FilterChipDefaults.filterChipColors( + selectedContainerColor = + MaterialTheme + .colorScheme + .primaryContainer, + selectedLabelColor = + MaterialTheme + .colorScheme + .onPrimaryContainer, + ), ) } } @@ -1762,40 +1778,40 @@ fun EnhancedAddAttemptDialog( // Difficulty System Selection Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { Text( - text = "Difficulty System", - style = MaterialTheme.typography.bodyLarge, - fontWeight = FontWeight.Medium, - color = MaterialTheme.colorScheme.onSurface + text = "Difficulty System", + style = MaterialTheme.typography.bodyLarge, + fontWeight = FontWeight.Medium, + color = MaterialTheme.colorScheme.onSurface, ) LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) { val availableSystems = - DifficultySystem.systemsForClimbType( - selectedClimbType - ) - .filter { system -> - gym.difficultySystems.contains(system) - } + DifficultySystem.systemsForClimbType( + selectedClimbType, + ) + .filter { system -> + gym.difficultySystems.contains(system) + } items(availableSystems) { system -> FilterChip( - onClick = { selectedDifficultySystem = system }, - label = { - Text( - system.displayName, - fontWeight = FontWeight.Medium - ) - }, - selected = selectedDifficultySystem == system, - colors = - FilterChipDefaults.filterChipColors( - selectedContainerColor = - MaterialTheme - .colorScheme - .primaryContainer, - selectedLabelColor = - MaterialTheme - .colorScheme - .onPrimaryContainer - ) + onClick = { selectedDifficultySystem = system }, + label = { + Text( + system.displayName, + fontWeight = FontWeight.Medium, + ) + }, + selected = selectedDifficultySystem == system, + colors = + FilterChipDefaults.filterChipColors( + selectedContainerColor = + MaterialTheme + .colorScheme + .primaryContainer, + selectedLabelColor = + MaterialTheme + .colorScheme + .onPrimaryContainer, + ), ) } } @@ -1803,112 +1819,114 @@ fun EnhancedAddAttemptDialog( if (selectedDifficultySystem == DifficultySystem.CUSTOM) { OutlinedTextField( - value = newProblemGrade, - onValueChange = { newValue -> - // Only allow integers for custom scales - if (newValue.isEmpty() || - newValue.all { it.isDigit() } - ) { - newProblemGrade = newValue - } - }, - label = { Text("Grade *") }, - placeholder = { - Text("Enter numeric grade (e.g. 5, 10, 15)") - }, - modifier = Modifier.fillMaxWidth(), - singleLine = true, - colors = - OutlinedTextFieldDefaults.colors( - focusedBorderColor = - MaterialTheme.colorScheme - .primary, - unfocusedBorderColor = - MaterialTheme.colorScheme - .outline - ), - isError = newProblemGrade.isBlank(), - keyboardOptions = - KeyboardOptions( - keyboardType = KeyboardType.Number - ), - supportingText = - if (newProblemGrade.isBlank()) { - { - Text( - "Grade is required", - color = - MaterialTheme - .colorScheme - .error - ) - } - } else { - { - Text( - "Custom grades must be whole numbers", - color = - MaterialTheme - .colorScheme - .onSurfaceVariant - ) - } - } + value = newProblemGrade, + onValueChange = { newValue -> + // Only allow integers for custom scales + if (newValue.isEmpty() || + newValue.all { it.isDigit() } + ) { + newProblemGrade = newValue + } + }, + label = { Text("Grade *") }, + placeholder = { + Text("Enter numeric grade (e.g. 5, 10, 15)") + }, + modifier = Modifier.fillMaxWidth(), + singleLine = true, + colors = + OutlinedTextFieldDefaults.colors( + focusedBorderColor = + MaterialTheme.colorScheme + .primary, + unfocusedBorderColor = + MaterialTheme.colorScheme + .outline, + ), + isError = newProblemGrade.isBlank(), + keyboardOptions = + KeyboardOptions( + keyboardType = KeyboardType.Number, + ), + supportingText = + if (newProblemGrade.isBlank()) { + { + Text( + "Grade is required", + color = + MaterialTheme + .colorScheme + .error, + ) + } + } else { + { + Text( + "Custom grades must be whole numbers", + color = + MaterialTheme + .colorScheme + .onSurfaceVariant, + ) + } + }, ) } else { var expanded by remember { mutableStateOf(false) } val availableGrades = selectedDifficultySystem.availableGrades ExposedDropdownMenuBox( - expanded = expanded, - onExpandedChange = { expanded = !expanded }, - modifier = Modifier.fillMaxWidth() + expanded = expanded, + onExpandedChange = { expanded = !expanded }, + modifier = Modifier.fillMaxWidth(), ) { OutlinedTextField( - value = newProblemGrade, - onValueChange = {}, - readOnly = true, - label = { Text("Grade *") }, - trailingIcon = { - ExposedDropdownMenuDefaults.TrailingIcon( - expanded = expanded + value = newProblemGrade, + onValueChange = {}, + readOnly = true, + label = { Text("Grade *") }, + trailingIcon = { + ExposedDropdownMenuDefaults.TrailingIcon( + expanded = expanded, + ) + }, + colors = + ExposedDropdownMenuDefaults + .outlinedTextFieldColors(), + modifier = + Modifier.menuAnchor( + ExposedDropdownMenuAnchorType + .PrimaryNotEditable, + enabled = true, + ) + .fillMaxWidth(), + isError = newProblemGrade.isBlank(), + supportingText = + if (newProblemGrade.isBlank()) { + { + Text( + "Grade is required", + color = + MaterialTheme + .colorScheme + .error, ) - }, - colors = - ExposedDropdownMenuDefaults - .outlinedTextFieldColors(), - modifier = - Modifier.menuAnchor( - ExposedDropdownMenuAnchorType - .PrimaryNotEditable, - enabled = true - ) - .fillMaxWidth(), - isError = newProblemGrade.isBlank(), - supportingText = - if (newProblemGrade.isBlank()) { - { - Text( - "Grade is required", - color = - MaterialTheme - .colorScheme - .error - ) - } - } else null + } + } else { + null + }, ) ExposedDropdownMenu( - expanded = expanded, - onDismissRequest = { expanded = false } + expanded = expanded, + onDismissRequest = { expanded = false }, ) { availableGrades.forEach { grade -> DropdownMenuItem( - text = { Text(grade) }, - onClick = { - newProblemGrade = grade - expanded = false - } + text = { Text(grade) }, + onClick = { + newProblemGrade = grade + expanded = false + }, ) } } @@ -1918,15 +1936,15 @@ fun EnhancedAddAttemptDialog( // Photos Section Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { Text( - text = "Photos (Optional)", - style = MaterialTheme.typography.bodyLarge, - fontWeight = FontWeight.Medium, - color = MaterialTheme.colorScheme.onSurface + text = "Photos (Optional)", + style = MaterialTheme.typography.bodyLarge, + fontWeight = FontWeight.Medium, + color = MaterialTheme.colorScheme.onSurface, ) ImagePicker( - imageUris = newProblemImagePaths, - onImagesChanged = { newProblemImagePaths = it }, - maxImages = 5 + imageUris = newProblemImagePaths, + onImagesChanged = { newProblemImagePaths = it }, + maxImages = 5, ) } } @@ -1937,61 +1955,63 @@ fun EnhancedAddAttemptDialog( item { Column(verticalArrangement = Arrangement.spacedBy(12.dp)) { Text( - text = "Attempt Result", - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.SemiBold, - color = MaterialTheme.colorScheme.onSurface + text = "Attempt Result", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.SemiBold, + color = MaterialTheme.colorScheme.onSurface, ) Card( - colors = - CardDefaults.cardColors( - containerColor = - MaterialTheme.colorScheme.surfaceVariant - .copy(alpha = 0.3f) - ) + colors = + CardDefaults.cardColors( + containerColor = + MaterialTheme.colorScheme.surfaceVariant + .copy(alpha = 0.3f), + ), ) { Column(modifier = Modifier.padding(12.dp).selectableGroup()) { AttemptResult.entries.forEach { result -> Row( - verticalAlignment = Alignment.CenterVertically, - modifier = - Modifier.fillMaxWidth() - .selectable( - selected = - selectedResult == - result, - onClick = { - selectedResult = result - }, - role = Role.RadioButton - ) - .padding(vertical = 4.dp) + verticalAlignment = Alignment.CenterVertically, + modifier = + Modifier.fillMaxWidth() + .selectable( + selected = + selectedResult == + result, + onClick = { + selectedResult = result + }, + role = Role.RadioButton, + ) + .padding(vertical = 4.dp), ) { RadioButton( - selected = selectedResult == result, - onClick = null, - colors = - RadioButtonDefaults.colors( - selectedColor = - MaterialTheme - .colorScheme - .primary - ) + selected = selectedResult == result, + onClick = null, + colors = + RadioButtonDefaults.colors( + selectedColor = + MaterialTheme + .colorScheme + .primary, + ), ) Spacer(modifier = Modifier.width(12.dp)) Text( - text = - result.name.lowercase() - .replaceFirstChar { - it.uppercase() - }, - style = MaterialTheme.typography.bodyMedium, - fontWeight = - if (selectedResult == result) - FontWeight.Medium - else FontWeight.Normal, - color = MaterialTheme.colorScheme.onSurface + text = + result.name.lowercase() + .replaceFirstChar { + it.uppercase() + }, + style = MaterialTheme.typography.bodyMedium, + fontWeight = + if (selectedResult == result) { + FontWeight.Medium + } else { + FontWeight.Normal + }, + color = MaterialTheme.colorScheme.onSurface, ) } } @@ -2000,156 +2020,161 @@ fun EnhancedAddAttemptDialog( Column(verticalArrangement = Arrangement.spacedBy(12.dp)) { Text( - text = "Additional Details", - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.SemiBold, - color = MaterialTheme.colorScheme.onSurface + text = "Additional Details", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.SemiBold, + color = MaterialTheme.colorScheme.onSurface, ) OutlinedTextField( - value = highestHold, - onValueChange = { highestHold = it }, - label = { Text("Highest Hold") }, - placeholder = { - Text("e.g., 'jugs near the top', 'crux move'") - }, - modifier = Modifier.fillMaxWidth(), - singleLine = true, - colors = - OutlinedTextFieldDefaults.colors( - focusedBorderColor = - MaterialTheme.colorScheme.primary, - unfocusedBorderColor = - MaterialTheme.colorScheme.outline - ) + value = highestHold, + onValueChange = { highestHold = it }, + label = { Text("Highest Hold") }, + placeholder = { + Text("e.g., 'jugs near the top', 'crux move'") + }, + modifier = Modifier.fillMaxWidth(), + singleLine = true, + colors = + OutlinedTextFieldDefaults.colors( + focusedBorderColor = + MaterialTheme.colorScheme.primary, + unfocusedBorderColor = + MaterialTheme.colorScheme.outline, + ), ) OutlinedTextField( - value = notes, - onValueChange = { notes = it }, - label = { Text("Notes") }, - placeholder = { - Text("e.g., 'need to work on heel hooks', 'pumped out'") - }, - modifier = Modifier.fillMaxWidth(), - minLines = 3, - maxLines = 4, - colors = - OutlinedTextFieldDefaults.colors( - focusedBorderColor = - MaterialTheme.colorScheme.primary, - unfocusedBorderColor = - MaterialTheme.colorScheme.outline - ) + value = notes, + onValueChange = { notes = it }, + label = { Text("Notes") }, + placeholder = { + Text("e.g., 'need to work on heel hooks', 'pumped out'") + }, + modifier = Modifier.fillMaxWidth(), + minLines = 3, + maxLines = 4, + colors = + OutlinedTextFieldDefaults.colors( + focusedBorderColor = + MaterialTheme.colorScheme.primary, + unfocusedBorderColor = + MaterialTheme.colorScheme.outline, + ), ) } Row( - modifier = Modifier.fillMaxWidth().padding(top = 8.dp), - horizontalArrangement = Arrangement.spacedBy(12.dp) + modifier = Modifier.fillMaxWidth().padding(top = 8.dp), + horizontalArrangement = Arrangement.spacedBy(12.dp), ) { OutlinedButton( - onClick = onDismiss, - modifier = Modifier.weight(1f), - colors = - ButtonDefaults.outlinedButtonColors( - contentColor = - MaterialTheme.colorScheme.onSurface - ) + onClick = onDismiss, + modifier = Modifier.weight(1f), + colors = + ButtonDefaults.outlinedButtonColors( + contentColor = + MaterialTheme.colorScheme.onSurface, + ), ) { Text("Cancel", fontWeight = FontWeight.Medium) } Button( - onClick = { - if (showCreateProblem) { - // Create new problem first - if (newProblemGrade.isNotBlank()) { - val difficulty = - DifficultyGrade( - system = - selectedDifficultySystem, - grade = newProblemGrade, - numericValue = - when (selectedDifficultySystem - ) { - DifficultySystem - .V_SCALE -> - newProblemGrade - .removePrefix( - "V" - ) - .toIntOrNull() - ?: 0 - else -> - newProblemGrade - .hashCode() % - 100 - } - ) + onClick = { + if (showCreateProblem) { + // Create new problem first + if (newProblemGrade.isNotBlank()) { + val difficulty = + DifficultyGrade( + system = + selectedDifficultySystem, + grade = newProblemGrade, + numericValue = + when ( + selectedDifficultySystem + ) { + DifficultySystem + .V_SCALE, + -> + newProblemGrade + .removePrefix( + "V", + ) + .toIntOrNull() + ?: 0 + else -> + newProblemGrade + .hashCode() % + 100 + }, + ) - val newProblem = - Problem.create( - gymId = gym.id, - name = - newProblemName.ifBlank { - null - }, - climbType = selectedClimbType, - difficulty = difficulty, - imagePaths = - newProblemImagePaths - ) + val newProblem = + Problem.create( + gymId = gym.id, + name = + newProblemName.ifBlank { + null + }, + climbType = selectedClimbType, + difficulty = difficulty, + imagePaths = + newProblemImagePaths, + ) - onProblemCreated(newProblem) + onProblemCreated(newProblem) - // Create attempt for the new problem - val attempt = - Attempt.create( - sessionId = session.id, - problemId = newProblem.id, - result = selectedResult, - highestHold = - highestHold.ifBlank { - null - }, - notes = notes.ifBlank { null } - ) - onAttemptAdded(attempt) + // Create attempt for the new problem + val attempt = + Attempt.create( + sessionId = session.id, + problemId = newProblem.id, + result = selectedResult, + highestHold = + highestHold.ifBlank { + null + }, + notes = notes.ifBlank { null }, + ) + onAttemptAdded(attempt) - // Reset form - newProblemName = "" - newProblemGrade = "" - newProblemImagePaths = emptyList() - showCreateProblem = false - } - } else { - // Create attempt for selected problem - selectedProblem?.let { problem -> - val attempt = - Attempt.create( - sessionId = session.id, - problemId = problem.id, - result = selectedResult, - highestHold = - highestHold.ifBlank { - null - }, - notes = notes.ifBlank { null } - ) - onAttemptAdded(attempt) - } + // Reset form + newProblemName = "" + newProblemGrade = "" + newProblemImagePaths = emptyList() + showCreateProblem = false } - }, - enabled = - if (showCreateProblem) newProblemGrade.isNotBlank() - else selectedProblem != null, - modifier = Modifier.weight(1f), - colors = - ButtonDefaults.buttonColors( - containerColor = - MaterialTheme.colorScheme.primary, - disabledContainerColor = - MaterialTheme.colorScheme.onSurface - .copy(alpha = 0.12f) - ) + } else { + // Create attempt for selected problem + selectedProblem?.let { problem -> + val attempt = + Attempt.create( + sessionId = session.id, + problemId = problem.id, + result = selectedResult, + highestHold = + highestHold.ifBlank { + null + }, + notes = notes.ifBlank { null }, + ) + onAttemptAdded(attempt) + } + } + }, + enabled = + if (showCreateProblem) { + newProblemGrade.isNotBlank() + } else { + selectedProblem != null + }, + modifier = Modifier.weight(1f), + colors = + ButtonDefaults.buttonColors( + containerColor = + MaterialTheme.colorScheme.primary, + disabledContainerColor = + MaterialTheme.colorScheme.onSurface + .copy(alpha = 0.12f), + ), ) { Text("Add", fontWeight = FontWeight.Medium) } } } diff --git a/android/app/src/main/java/com/atridad/ascently/ui/screens/GymsScreen.kt b/android/app/src/main/java/com/atridad/ascently/ui/screens/GymsScreen.kt index 021bd05..2464e1a 100644 --- a/android/app/src/main/java/com/atridad/ascently/ui/screens/GymsScreen.kt +++ b/android/app/src/main/java/com/atridad/ascently/ui/screens/GymsScreen.kt @@ -22,21 +22,21 @@ fun GymsScreen(viewModel: ClimbViewModel, onNavigateToGymDetail: (String) -> Uni Column(modifier = Modifier.fillMaxSize().padding(16.dp)) { Row( - modifier = Modifier.fillMaxWidth(), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(12.dp) + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(12.dp), ) { Icon( - painter = painterResource(id = R.drawable.ic_mountains), - contentDescription = "Ascently Logo", - modifier = Modifier.size(32.dp), - tint = MaterialTheme.colorScheme.primary + painter = painterResource(id = R.drawable.ic_mountains), + contentDescription = "Ascently Logo", + modifier = Modifier.size(32.dp), + tint = MaterialTheme.colorScheme.primary, ) Text( - text = "Climbing Gyms", - style = MaterialTheme.typography.headlineMedium, - fontWeight = FontWeight.Bold, - modifier = Modifier.weight(1f) + text = "Climbing Gyms", + style = MaterialTheme.typography.headlineMedium, + fontWeight = FontWeight.Bold, + modifier = Modifier.weight(1f), ) SyncIndicator(isSyncing = viewModel.syncService.isSyncing) } @@ -45,10 +45,10 @@ fun GymsScreen(viewModel: ClimbViewModel, onNavigateToGymDetail: (String) -> Uni if (gyms.isEmpty()) { EmptyStateMessage( - title = "No Gyms Added", - message = "Add your favorite climbing gyms to start tracking your progress!", - onActionClick = {}, - actionText = "" + title = "No Gyms Added", + message = "Add your favorite climbing gyms to start tracking your progress!", + onActionClick = {}, + actionText = "", ) } else { LazyColumn { @@ -67,17 +67,17 @@ fun GymCard(gym: Gym, onClick: () -> Unit) { Card(onClick = onClick, modifier = Modifier.fillMaxWidth()) { Column(modifier = Modifier.fillMaxWidth().padding(16.dp)) { Text( - text = gym.name, - style = MaterialTheme.typography.titleLarge, - fontWeight = FontWeight.Bold + text = gym.name, + style = MaterialTheme.typography.titleLarge, + fontWeight = FontWeight.Bold, ) gym.location?.let { location -> Spacer(modifier = Modifier.height(4.dp)) Text( - text = location, - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant + text = location, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } @@ -86,9 +86,9 @@ fun GymCard(gym: Gym, onClick: () -> Unit) { Row { gym.supportedClimbTypes.forEach { climbType -> AssistChip( - onClick = {}, - label = { Text(climbType.displayName) }, - modifier = Modifier.padding(end = 4.dp) + onClick = {}, + label = { Text(climbType.displayName) }, + modifier = Modifier.padding(end = 4.dp), ) } } @@ -96,10 +96,10 @@ fun GymCard(gym: Gym, onClick: () -> Unit) { if (gym.difficultySystems.isNotEmpty()) { Spacer(modifier = Modifier.height(4.dp)) Text( - text = - "Systems: ${gym.difficultySystems.joinToString(", ") { it.displayName }}", - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant + text = + "Systems: ${gym.difficultySystems.joinToString(", ") { it.displayName }}", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } @@ -107,10 +107,10 @@ fun GymCard(gym: Gym, onClick: () -> Unit) { if (notes.isNotBlank()) { Spacer(modifier = Modifier.height(8.dp)) Text( - text = notes, - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - maxLines = 2 + text = notes, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + maxLines = 2, ) } } diff --git a/android/app/src/main/java/com/atridad/ascently/ui/screens/ProblemsScreen.kt b/android/app/src/main/java/com/atridad/ascently/ui/screens/ProblemsScreen.kt index 4799996..7d8ac49 100644 --- a/android/app/src/main/java/com/atridad/ascently/ui/screens/ProblemsScreen.kt +++ b/android/app/src/main/java/com/atridad/ascently/ui/screens/ProblemsScreen.kt @@ -36,11 +36,11 @@ fun ProblemsScreen(viewModel: ClimbViewModel, onNavigateToProblemDetail: (String // Apply filters val filteredProblems = - problems.filter { problem -> - val climbTypeMatch = selectedClimbType?.let { it == problem.climbType } != false - val gymMatch = selectedGym?.let { it.id == problem.gymId } != false - climbTypeMatch && gymMatch - } + problems.filter { problem -> + val climbTypeMatch = selectedClimbType?.let { it == problem.climbType } != false + val gymMatch = selectedGym?.let { it.id == problem.gymId } != false + climbTypeMatch && gymMatch + } // Separate active and inactive problems val activeProblems = filteredProblems.filter { it.isActive } @@ -49,21 +49,21 @@ fun ProblemsScreen(viewModel: ClimbViewModel, onNavigateToProblemDetail: (String Column(modifier = Modifier.fillMaxSize().padding(16.dp)) { Row( - modifier = Modifier.fillMaxWidth(), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(12.dp) + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(12.dp), ) { Icon( - painter = painterResource(id = R.drawable.ic_mountains), - contentDescription = "Ascently Logo", - modifier = Modifier.size(32.dp), - tint = MaterialTheme.colorScheme.primary + painter = painterResource(id = R.drawable.ic_mountains), + contentDescription = "Ascently Logo", + modifier = Modifier.size(32.dp), + tint = MaterialTheme.colorScheme.primary, ) Text( - text = "Climbing Problems", - style = MaterialTheme.typography.headlineMedium, - fontWeight = FontWeight.Bold, - modifier = Modifier.weight(1f) + text = "Climbing Problems", + style = MaterialTheme.typography.headlineMedium, + fontWeight = FontWeight.Bold, + modifier = Modifier.weight(1f), ) SyncIndicator(isSyncing = viewModel.syncService.isSyncing) } @@ -75,18 +75,18 @@ fun ProblemsScreen(viewModel: ClimbViewModel, onNavigateToProblemDetail: (String Card(modifier = Modifier.fillMaxWidth()) { Column(modifier = Modifier.padding(16.dp)) { Text( - text = "Filters", - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.Bold + text = "Filters", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold, ) Spacer(modifier = Modifier.height(12.dp)) // Climb Type Filter Text( - text = "Climb Type", - style = MaterialTheme.typography.bodyMedium, - fontWeight = FontWeight.Medium + text = "Climb Type", + style = MaterialTheme.typography.bodyMedium, + fontWeight = FontWeight.Medium, ) Spacer(modifier = Modifier.height(8.dp)) @@ -94,16 +94,16 @@ fun ProblemsScreen(viewModel: ClimbViewModel, onNavigateToProblemDetail: (String LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) { item { FilterChip( - onClick = { selectedClimbType = null }, - label = { Text("All Types") }, - selected = selectedClimbType == null + onClick = { selectedClimbType = null }, + label = { Text("All Types") }, + selected = selectedClimbType == null, ) } items(ClimbType.entries) { climbType -> FilterChip( - onClick = { selectedClimbType = climbType }, - label = { Text(climbType.displayName) }, - selected = selectedClimbType == climbType + onClick = { selectedClimbType = climbType }, + label = { Text(climbType.displayName) }, + selected = selectedClimbType == climbType, ) } } @@ -112,9 +112,9 @@ fun ProblemsScreen(viewModel: ClimbViewModel, onNavigateToProblemDetail: (String // Gym Filter Text( - text = "Gym", - style = MaterialTheme.typography.bodyMedium, - fontWeight = FontWeight.Medium + text = "Gym", + style = MaterialTheme.typography.bodyMedium, + fontWeight = FontWeight.Medium, ) Spacer(modifier = Modifier.height(8.dp)) @@ -122,16 +122,16 @@ fun ProblemsScreen(viewModel: ClimbViewModel, onNavigateToProblemDetail: (String LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) { item { FilterChip( - onClick = { selectedGym = null }, - label = { Text("All Gyms") }, - selected = selectedGym == null + onClick = { selectedGym = null }, + label = { Text("All Gyms") }, + selected = selectedGym == null, ) } items(gyms) { gym -> FilterChip( - onClick = { selectedGym = gym }, - label = { Text(gym.name) }, - selected = selectedGym?.id == gym.id + onClick = { selectedGym = gym }, + label = { Text(gym.name) }, + selected = selectedGym?.id == gym.id, ) } } @@ -140,10 +140,10 @@ fun ProblemsScreen(viewModel: ClimbViewModel, onNavigateToProblemDetail: (String if (selectedClimbType != null || selectedGym != null) { Spacer(modifier = Modifier.height(12.dp)) Text( - text = - "Showing ${filteredProblems.size} of ${problems.size} problems (${activeProblems.size} active, ${inactiveProblems.size} reset)", - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant + text = + "Showing ${filteredProblems.size} of ${problems.size} problems (${activeProblems.size} active, ${inactiveProblems.size} reset)", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } } @@ -154,35 +154,37 @@ fun ProblemsScreen(viewModel: ClimbViewModel, onNavigateToProblemDetail: (String if (filteredProblems.isEmpty()) { EmptyStateMessage( - title = - if (problems.isEmpty()) { - if (gyms.isEmpty()) "No Gyms Available" else "No Problems Yet" - } else { - "No Problems Match Filters" - }, - message = - if (problems.isEmpty()) { - if (gyms.isEmpty()) - "Add a gym first to start tracking problems and routes!" - else "Start tracking your favorite problems and routes!" - } else { - "Try adjusting your filters to see more problems." - }, - onActionClick = {}, - actionText = "" + title = + if (problems.isEmpty()) { + if (gyms.isEmpty()) "No Gyms Available" else "No Problems Yet" + } else { + "No Problems Match Filters" + }, + message = + if (problems.isEmpty()) { + if (gyms.isEmpty()) { + "Add a gym first to start tracking problems and routes!" + } else { + "Start tracking your favorite problems and routes!" + } + } else { + "Try adjusting your filters to see more problems." + }, + onActionClick = {}, + actionText = "", ) } else { LazyColumn { items(sortedProblems) { problem -> ProblemCard( - problem = problem, - gymName = gyms.find { it.id == problem.gymId }?.name ?: "Unknown Gym", - attempts = attempts, - onClick = { onNavigateToProblemDetail(problem.id) }, - onToggleActive = { - val updatedProblem = problem.copy(isActive = !problem.isActive) - viewModel.updateProblem(updatedProblem) - } + problem = problem, + gymName = gyms.find { it.id == problem.gymId }?.name ?: "Unknown Gym", + attempts = attempts, + onClick = { onNavigateToProblemDetail(problem.id) }, + onToggleActive = { + val updatedProblem = problem.copy(isActive = !problem.isActive) + viewModel.updateProblem(updatedProblem) + }, ) Spacer(modifier = Modifier.height(8.dp)) } @@ -194,81 +196,86 @@ fun ProblemsScreen(viewModel: ClimbViewModel, onNavigateToProblemDetail: (String @OptIn(ExperimentalMaterial3Api::class) @Composable fun ProblemCard( - problem: Problem, - gymName: String, - attempts: List, - onClick: () -> Unit, - onToggleActive: (() -> Unit)? = null + problem: Problem, + gymName: String, + attempts: List, + onClick: () -> Unit, + onToggleActive: (() -> Unit)? = null, ) { val isCompleted = - attempts.any { attempt -> - attempt.problemId == problem.id && - (attempt.result == AttemptResult.SUCCESS || - attempt.result == AttemptResult.FLASH) - } + attempts.any { attempt -> + attempt.problemId == problem.id && + ( + attempt.result == AttemptResult.SUCCESS || + attempt.result == AttemptResult.FLASH + ) + } Card(onClick = onClick, modifier = Modifier.fillMaxWidth()) { Column(modifier = Modifier.fillMaxWidth().padding(16.dp)) { Row( - modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.SpaceBetween, - verticalAlignment = Alignment.Top + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.Top, ) { Column(modifier = Modifier.weight(1f)) { Text( - text = problem.name ?: "Unnamed Problem", - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.Bold, - color = - if (problem.isActive) MaterialTheme.colorScheme.onSurface - else MaterialTheme.colorScheme.onSurface.copy(alpha = 0.6f) + text = problem.name ?: "Unnamed Problem", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold, + color = + if (problem.isActive) { + MaterialTheme.colorScheme.onSurface + } else { + MaterialTheme.colorScheme.onSurface.copy(alpha = 0.6f) + }, ) Text( - text = gymName, - style = MaterialTheme.typography.bodyMedium, - color = - MaterialTheme.colorScheme.onSurfaceVariant.copy( - alpha = if (problem.isActive) 1f else 0.6f - ) + text = gymName, + style = MaterialTheme.typography.bodyMedium, + color = + MaterialTheme.colorScheme.onSurfaceVariant.copy( + alpha = if (problem.isActive) 1f else 0.6f, + ), ) } Column(horizontalAlignment = Alignment.End) { Row( - horizontalArrangement = Arrangement.spacedBy(8.dp), - verticalAlignment = Alignment.CenterVertically + horizontalArrangement = Arrangement.spacedBy(8.dp), + verticalAlignment = Alignment.CenterVertically, ) { if (problem.imagePaths.isNotEmpty()) { Icon( - imageVector = Icons.Default.Image, - contentDescription = "Has images", - modifier = Modifier.size(16.dp), - tint = MaterialTheme.colorScheme.primary + imageVector = Icons.Default.Image, + contentDescription = "Has images", + modifier = Modifier.size(16.dp), + tint = MaterialTheme.colorScheme.primary, ) } if (isCompleted) { Icon( - imageVector = Icons.Default.CheckCircle, - contentDescription = "Completed", - modifier = Modifier.size(16.dp), - tint = MaterialTheme.colorScheme.tertiary + imageVector = Icons.Default.CheckCircle, + contentDescription = "Completed", + modifier = Modifier.size(16.dp), + tint = MaterialTheme.colorScheme.tertiary, ) } Text( - text = problem.difficulty.grade, - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.Bold, - color = MaterialTheme.colorScheme.primary + text = problem.difficulty.grade, + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold, + color = MaterialTheme.colorScheme.primary, ) } Text( - text = problem.climbType.displayName, - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant + text = problem.climbType.displayName, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } } @@ -276,9 +283,9 @@ fun ProblemCard( problem.location?.let { location -> Spacer(modifier = Modifier.height(4.dp)) Text( - text = "Location: $location", - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant + text = "Location: $location", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } @@ -287,9 +294,9 @@ fun ProblemCard( Row { problem.tags.take(3).forEach { tag -> AssistChip( - onClick = {}, - label = { Text(tag) }, - modifier = Modifier.padding(end = 4.dp) + onClick = {}, + label = { Text(tag) }, + modifier = Modifier.padding(end = 4.dp), ) } } @@ -298,10 +305,10 @@ fun ProblemCard( if (!problem.isActive) { Spacer(modifier = Modifier.height(8.dp)) Text( - text = "Reset / No Longer Set", - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.tertiary, - fontWeight = FontWeight.Medium + text = "Reset / No Longer Set", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.tertiary, + fontWeight = FontWeight.Medium, ) } @@ -309,19 +316,21 @@ fun ProblemCard( if (onToggleActive != null) { Spacer(modifier = Modifier.height(8.dp)) OutlinedButton( - onClick = onToggleActive, - colors = - ButtonDefaults.outlinedButtonColors( - contentColor = - if (problem.isActive) - MaterialTheme.colorScheme.tertiary - else MaterialTheme.colorScheme.primary - ), - modifier = Modifier.fillMaxWidth() + onClick = onToggleActive, + colors = + ButtonDefaults.outlinedButtonColors( + contentColor = + if (problem.isActive) { + MaterialTheme.colorScheme.tertiary + } else { + MaterialTheme.colorScheme.primary + }, + ), + modifier = Modifier.fillMaxWidth(), ) { Text( - text = if (problem.isActive) "Mark as Reset" else "Mark as Active", - style = MaterialTheme.typography.bodySmall + text = if (problem.isActive) "Mark as Reset" else "Mark as Active", + style = MaterialTheme.typography.bodySmall, ) } } diff --git a/android/app/src/main/java/com/atridad/ascently/ui/screens/SessionsScreen.kt b/android/app/src/main/java/com/atridad/ascently/ui/screens/SessionsScreen.kt index 0651f47..d3138bb 100644 --- a/android/app/src/main/java/com/atridad/ascently/ui/screens/SessionsScreen.kt +++ b/android/app/src/main/java/com/atridad/ascently/ui/screens/SessionsScreen.kt @@ -24,6 +24,7 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp +import androidx.core.content.edit import com.atridad.ascently.R import com.atridad.ascently.data.model.ClimbSession import com.atridad.ascently.data.model.SessionStatus @@ -36,11 +37,10 @@ import java.time.YearMonth import java.time.format.DateTimeFormatter import java.time.format.TextStyle import java.util.Locale -import androidx.core.content.edit enum class ViewMode { LIST, - CALENDAR + CALENDAR, } @OptIn(ExperimentalMaterial3Api::class) @@ -53,7 +53,7 @@ fun SessionsScreen(viewModel: ClimbViewModel, onNavigateToSessionDetail: (String val uiState by viewModel.uiState.collectAsState() val sharedPreferences = - context.getSharedPreferences("SessionsPreferences", Context.MODE_PRIVATE) + context.getSharedPreferences("SessionsPreferences", Context.MODE_PRIVATE) val savedViewMode = sharedPreferences.getString("view_mode", "LIST") var viewMode by remember { mutableStateOf(if (savedViewMode == "CALENDAR") ViewMode.CALENDAR else ViewMode.LIST) @@ -66,38 +66,41 @@ fun SessionsScreen(viewModel: ClimbViewModel, onNavigateToSessionDetail: (String Column(modifier = Modifier.fillMaxSize().padding(16.dp)) { Row( - modifier = Modifier.fillMaxWidth(), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(12.dp) + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(12.dp), ) { Icon( - painter = painterResource(id = R.drawable.ic_mountains), - contentDescription = "Ascently Logo", - modifier = Modifier.size(32.dp), - tint = MaterialTheme.colorScheme.primary + painter = painterResource(id = R.drawable.ic_mountains), + contentDescription = "Ascently Logo", + modifier = Modifier.size(32.dp), + tint = MaterialTheme.colorScheme.primary, ) Text( - text = "Climbing Sessions", - style = MaterialTheme.typography.headlineMedium, - fontWeight = FontWeight.Bold, - modifier = Modifier.weight(1f) + text = "Climbing Sessions", + style = MaterialTheme.typography.headlineMedium, + fontWeight = FontWeight.Bold, + modifier = Modifier.weight(1f), ) IconButton( - onClick = { - viewMode = - if (viewMode == ViewMode.LIST) ViewMode.CALENDAR else ViewMode.LIST - selectedDate = null - sharedPreferences.edit { putString("view_mode", viewMode.name) } - } + onClick = { + viewMode = + if (viewMode == ViewMode.LIST) ViewMode.CALENDAR else ViewMode.LIST + selectedDate = null + sharedPreferences.edit { putString("view_mode", viewMode.name) } + }, ) { Icon( - imageVector = - if (viewMode == ViewMode.LIST) Icons.Default.CalendarMonth - else Icons.AutoMirrored.Filled.List, - contentDescription = - if (viewMode == ViewMode.LIST) "Calendar View" else "List View", - tint = MaterialTheme.colorScheme.primary + imageVector = + if (viewMode == ViewMode.LIST) { + Icons.Default.CalendarMonth + } else { + Icons.AutoMirrored.Filled.List + }, + contentDescription = + if (viewMode == ViewMode.LIST) "Calendar View" else "List View", + tint = MaterialTheme.colorScheme.primary, ) } @@ -107,10 +110,10 @@ fun SessionsScreen(viewModel: ClimbViewModel, onNavigateToSessionDetail: (String Spacer(modifier = Modifier.height(16.dp)) ActiveSessionBanner( - activeSession = activeSession, - gym = activeSessionGym, - onSessionClick = { activeSession?.let { onNavigateToSessionDetail(it.id) } }, - onEndSession = { activeSession?.let { viewModel.endSession(context, it.id) } } + activeSession = activeSession, + gym = activeSessionGym, + onSessionClick = { activeSession?.let { onNavigateToSessionDetail(it.id) } }, + onEndSession = { activeSession?.let { viewModel.endSession(context, it.id) } }, ) if (activeSession != null) { @@ -119,13 +122,15 @@ fun SessionsScreen(viewModel: ClimbViewModel, onNavigateToSessionDetail: (String if (completedSessions.isEmpty() && activeSession == null) { EmptyStateMessage( - title = if (gyms.isEmpty()) "No Gyms Available" else "No Sessions Yet", - message = - if (gyms.isEmpty()) - "Add a gym first to start tracking your climbing sessions!" - else "Start your first climbing session!", - onActionClick = {}, - actionText = "" + title = if (gyms.isEmpty()) "No Gyms Available" else "No Sessions Yet", + message = + if (gyms.isEmpty()) { + "Add a gym first to start tracking your climbing sessions!" + } else { + "Start your first climbing session!" + }, + onActionClick = {}, + actionText = "", ) } else { when (viewMode) { @@ -133,10 +138,10 @@ fun SessionsScreen(viewModel: ClimbViewModel, onNavigateToSessionDetail: (String LazyColumn { items(completedSessions) { session -> SessionCard( - session = session, - gymName = gyms.find { it.id == session.gymId }?.name - ?: "Unknown Gym", - onClick = { onNavigateToSessionDetail(session.id) } + session = session, + gymName = gyms.find { it.id == session.gymId }?.name + ?: "Unknown Gym", + onClick = { onNavigateToSessionDetail(session.id) }, ) Spacer(modifier = Modifier.height(8.dp)) } @@ -144,13 +149,13 @@ fun SessionsScreen(viewModel: ClimbViewModel, onNavigateToSessionDetail: (String } ViewMode.CALENDAR -> { CalendarView( - sessions = completedSessions, - gyms = gyms, + sessions = completedSessions, + gyms = gyms, selectedMonth = selectedMonth, - onMonthChange = { selectedMonth = it }, - selectedDate = selectedDate, - onDateSelected = { selectedDate = it }, - onNavigateToSessionDetail = onNavigateToSessionDetail + onMonthChange = { selectedMonth = it }, + selectedDate = selectedDate, + onDateSelected = { selectedDate = it }, + onNavigateToSessionDetail = onNavigateToSessionDetail, ) } } @@ -164,27 +169,27 @@ fun SessionsScreen(viewModel: ClimbViewModel, onNavigateToSessionDetail: (String } Card( - modifier = Modifier.fillMaxWidth().padding(16.dp), - colors = - CardDefaults.cardColors( - containerColor = MaterialTheme.colorScheme.primaryContainer - ), - shape = RoundedCornerShape(12.dp) + modifier = Modifier.fillMaxWidth().padding(16.dp), + colors = + CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.primaryContainer, + ), + shape = RoundedCornerShape(12.dp), ) { Row( - modifier = Modifier.fillMaxWidth().padding(16.dp), - verticalAlignment = Alignment.CenterVertically + modifier = Modifier.fillMaxWidth().padding(16.dp), + verticalAlignment = Alignment.CenterVertically, ) { Icon( - Icons.Default.CheckCircle, - contentDescription = null, - tint = MaterialTheme.colorScheme.primary + Icons.Default.CheckCircle, + contentDescription = null, + tint = MaterialTheme.colorScheme.primary, ) Spacer(modifier = Modifier.width(8.dp)) Text( - text = message, - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onPrimaryContainer + text = message, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onPrimaryContainer, ) } } @@ -197,27 +202,27 @@ fun SessionsScreen(viewModel: ClimbViewModel, onNavigateToSessionDetail: (String } Card( - modifier = Modifier.fillMaxWidth().padding(16.dp), - colors = - CardDefaults.cardColors( - containerColor = MaterialTheme.colorScheme.errorContainer - ), - shape = RoundedCornerShape(12.dp) + modifier = Modifier.fillMaxWidth().padding(16.dp), + colors = + CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.errorContainer, + ), + shape = RoundedCornerShape(12.dp), ) { Row( - modifier = Modifier.fillMaxWidth().padding(16.dp), - verticalAlignment = Alignment.CenterVertically + modifier = Modifier.fillMaxWidth().padding(16.dp), + verticalAlignment = Alignment.CenterVertically, ) { Icon( - Icons.Default.Warning, - contentDescription = null, - tint = MaterialTheme.colorScheme.error + Icons.Default.Warning, + contentDescription = null, + tint = MaterialTheme.colorScheme.error, ) Spacer(modifier = Modifier.width(8.dp)) Text( - text = error, - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onErrorContainer + text = error, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onErrorContainer, ) } } @@ -230,18 +235,18 @@ fun SessionCard(session: ClimbSession, gymName: String, onClick: () -> Unit) { Card(onClick = onClick, modifier = Modifier.fillMaxWidth()) { Column(modifier = Modifier.fillMaxWidth().padding(16.dp)) { Row( - modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.SpaceBetween + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, ) { Text( - text = gymName, - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.Bold + text = gymName, + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold, ) Text( - text = formatDate(session.date), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant + text = formatDate(session.date), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } @@ -249,8 +254,8 @@ fun SessionCard(session: ClimbSession, gymName: String, onClick: () -> Unit) { session.duration?.let { duration -> Text( - text = "Duration: $duration minutes", - style = MaterialTheme.typography.bodyMedium + text = "Duration: $duration minutes", + style = MaterialTheme.typography.bodyMedium, ) } @@ -258,10 +263,10 @@ fun SessionCard(session: ClimbSession, gymName: String, onClick: () -> Unit) { if (notes.isNotBlank()) { Spacer(modifier = Modifier.height(4.dp)) Text( - text = notes, - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - maxLines = 2 + text = notes, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + maxLines = 2, ) } } @@ -271,30 +276,30 @@ fun SessionCard(session: ClimbSession, gymName: String, onClick: () -> Unit) { @Composable fun EmptyStateMessage( - title: String, - message: String, - onActionClick: () -> Unit, - actionText: String + title: String, + message: String, + onActionClick: () -> Unit, + actionText: String, ) { Column( - modifier = Modifier.fillMaxSize(), - horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.Center + modifier = Modifier.fillMaxSize(), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center, ) { Text( - text = title, - style = MaterialTheme.typography.headlineSmall, - fontWeight = FontWeight.Bold, - textAlign = TextAlign.Center + text = title, + style = MaterialTheme.typography.headlineSmall, + fontWeight = FontWeight.Bold, + textAlign = TextAlign.Center, ) Spacer(modifier = Modifier.height(8.dp)) Text( - text = message, - style = MaterialTheme.typography.bodyLarge, - color = MaterialTheme.colorScheme.onSurfaceVariant, - textAlign = TextAlign.Center + text = message, + style = MaterialTheme.typography.bodyLarge, + color = MaterialTheme.colorScheme.onSurfaceVariant, + textAlign = TextAlign.Center, ) if (actionText.isNotEmpty()) { @@ -307,64 +312,64 @@ fun EmptyStateMessage( @Composable fun CalendarView( - sessions: List, - gyms: List, - selectedMonth: YearMonth, - onMonthChange: (YearMonth) -> Unit, - selectedDate: LocalDate?, - onDateSelected: (LocalDate?) -> Unit, - onNavigateToSessionDetail: (String) -> Unit + sessions: List, + gyms: List, + selectedMonth: YearMonth, + onMonthChange: (YearMonth) -> Unit, + selectedDate: LocalDate?, + onDateSelected: (LocalDate?) -> Unit, + onNavigateToSessionDetail: (String) -> Unit, ) { val sessionsByDate = - remember(sessions) { - sessions.groupBy { - try { - java.time.Instant.parse(it.date) - .atZone(java.time.ZoneId.systemDefault()) - .toLocalDate() - } catch (_: Exception) { - LocalDate.parse(it.date, DateTimeFormatter.ISO_LOCAL_DATE) - } + remember(sessions) { + sessions.groupBy { + try { + java.time.Instant.parse(it.date) + .atZone(java.time.ZoneId.systemDefault()) + .toLocalDate() + } catch (_: Exception) { + LocalDate.parse(it.date, DateTimeFormatter.ISO_LOCAL_DATE) } } + } val firstDayOfMonth = selectedMonth.atDay(1) val daysInMonth = selectedMonth.lengthOfMonth() val firstDayOfWeek = firstDayOfMonth.dayOfWeek.value % 7 val totalCells = - ((firstDayOfWeek + daysInMonth) / 7.0).let { - if (it == it.toInt().toDouble()) it.toInt() * 7 else (it.toInt() + 1) * 7 - } + ((firstDayOfWeek + daysInMonth) / 7.0).let { + if (it == it.toInt().toDouble()) it.toInt() * 7 else (it.toInt() + 1) * 7 + } val numRows = totalCells / 7 LazyColumn(modifier = Modifier.fillMaxSize()) { item { Card( - modifier = Modifier.fillMaxWidth(), - colors = - CardDefaults.cardColors( - containerColor = MaterialTheme.colorScheme.surfaceVariant - ) + modifier = Modifier.fillMaxWidth(), + colors = + CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.surfaceVariant, + ), ) { Column( - modifier = - Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 12.dp), - horizontalAlignment = Alignment.CenterHorizontally + modifier = + Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 12.dp), + horizontalAlignment = Alignment.CenterHorizontally, ) { Row( - modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.SpaceBetween, - verticalAlignment = Alignment.CenterVertically + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically, ) { IconButton(onClick = { onMonthChange(selectedMonth.minusMonths(1)) }) { Text("‹", style = MaterialTheme.typography.headlineMedium) } Text( - text = - "${selectedMonth.month.getDisplayName(TextStyle.FULL, Locale.getDefault())} ${selectedMonth.year}", - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.Bold + text = + "${selectedMonth.month.getDisplayName(TextStyle.FULL, Locale.getDefault())} ${selectedMonth.year}", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold, ) IconButton(onClick = { onMonthChange(selectedMonth.plusMonths(1)) }) { @@ -375,22 +380,22 @@ fun CalendarView( Spacer(modifier = Modifier.height(8.dp)) Button( - onClick = { - val today = LocalDate.now() - onMonthChange(YearMonth.from(today)) - onDateSelected(today) - }, - shape = RoundedCornerShape(50), - colors = - ButtonDefaults.buttonColors( - containerColor = MaterialTheme.colorScheme.primary - ), - contentPadding = PaddingValues(horizontal = 20.dp, vertical = 8.dp) + onClick = { + val today = LocalDate.now() + onMonthChange(YearMonth.from(today)) + onDateSelected(today) + }, + shape = RoundedCornerShape(50), + colors = + ButtonDefaults.buttonColors( + containerColor = MaterialTheme.colorScheme.primary, + ), + contentPadding = PaddingValues(horizontal = 20.dp, vertical = 8.dp), ) { Text( - text = "Today", - style = MaterialTheme.typography.labelLarge, - fontWeight = FontWeight.SemiBold + text = "Today", + style = MaterialTheme.typography.labelLarge, + fontWeight = FontWeight.SemiBold, ) } } @@ -401,12 +406,12 @@ fun CalendarView( Row(modifier = Modifier.fillMaxWidth()) { listOf("Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat").forEach { day -> Text( - text = day, - modifier = Modifier.weight(1f), - textAlign = TextAlign.Center, - style = MaterialTheme.typography.labelSmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - fontWeight = FontWeight.Bold + text = day, + modifier = Modifier.weight(1f), + textAlign = TextAlign.Center, + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + fontWeight = FontWeight.Bold, ) } } @@ -428,15 +433,15 @@ fun CalendarView( val isToday = date == LocalDate.now() CalendarDay( - day = dayNumber, - hasSession = sessionsOnDate.isNotEmpty(), - isSelected = isSelected, - isToday = isToday, - onClick = { - if (sessionsOnDate.isNotEmpty()) { - onDateSelected(if (isSelected) null else date) - } + day = dayNumber, + hasSession = sessionsOnDate.isNotEmpty(), + isSelected = isSelected, + isToday = isToday, + onClick = { + if (sessionsOnDate.isNotEmpty()) { + onDateSelected(if (isSelected) null else date) } + }, ) } else { Spacer(modifier = Modifier.aspectRatio(1f)) @@ -453,19 +458,19 @@ fun CalendarView( Spacer(modifier = Modifier.height(16.dp)) Text( - text = - "Sessions on ${selectedDate.format(DateTimeFormatter.ofPattern("MMMM d, yyyy"))}", - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.Bold, - modifier = Modifier.padding(vertical = 8.dp) + text = + "Sessions on ${selectedDate.format(DateTimeFormatter.ofPattern("MMMM d, yyyy"))}", + style = MaterialTheme.typography.titleSmall, + fontWeight = FontWeight.Bold, + modifier = Modifier.padding(vertical = 8.dp), ) } items(sessionsOnSelectedDate) { session -> SessionCard( - session = session, - gymName = gyms.find { it.id == session.gymId }?.name ?: "Unknown Gym", - onClick = { onNavigateToSessionDetail(session.id) } + session = session, + gymName = gyms.find { it.id == session.gymId }?.name ?: "Unknown Gym", + onClick = { onNavigateToSessionDetail(session.id) }, ) Spacer(modifier = Modifier.height(8.dp)) } @@ -477,56 +482,58 @@ fun CalendarView( @Composable fun CalendarDay( - day: Int, - hasSession: Boolean, - isSelected: Boolean, - isToday: Boolean, - onClick: () -> Unit + day: Int, + hasSession: Boolean, + isSelected: Boolean, + isToday: Boolean, + onClick: () -> Unit, ) { Box( - modifier = - Modifier.aspectRatio(1f) - .padding(2.dp) - .clip(CircleShape) - .background( - when { - isSelected -> MaterialTheme.colorScheme.primaryContainer - isToday -> MaterialTheme.colorScheme.secondaryContainer - else -> Color.Transparent - } - ) - .clickable(enabled = hasSession, onClick = onClick), - contentAlignment = Alignment.Center + modifier = + Modifier.aspectRatio(1f) + .padding(2.dp) + .clip(CircleShape) + .background( + when { + isSelected -> MaterialTheme.colorScheme.primaryContainer + isToday -> MaterialTheme.colorScheme.secondaryContainer + else -> Color.Transparent + }, + ) + .clickable(enabled = hasSession, onClick = onClick), + contentAlignment = Alignment.Center, ) { Column( - horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.Center + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center, ) { Text( - text = day.toString(), - style = MaterialTheme.typography.bodyMedium, - color = - when { - isSelected -> MaterialTheme.colorScheme.onPrimaryContainer - isToday -> MaterialTheme.colorScheme.onSecondaryContainer - !hasSession -> MaterialTheme.colorScheme.onSurfaceVariant - else -> MaterialTheme.colorScheme.onSurface - }, - fontWeight = if (hasSession || isToday) FontWeight.Bold else FontWeight.Normal + text = day.toString(), + style = MaterialTheme.typography.bodyMedium, + color = + when { + isSelected -> MaterialTheme.colorScheme.onPrimaryContainer + isToday -> MaterialTheme.colorScheme.onSecondaryContainer + !hasSession -> MaterialTheme.colorScheme.onSurfaceVariant + else -> MaterialTheme.colorScheme.onSurface + }, + fontWeight = if (hasSession || isToday) FontWeight.Bold else FontWeight.Normal, ) if (hasSession) { Box( - modifier = - Modifier.size(6.dp) - .clip(CircleShape) - .background( - if (isSelected) MaterialTheme.colorScheme.primary - else - MaterialTheme.colorScheme.primary.copy( - alpha = 0.7f - ) - ) + modifier = + Modifier.size(6.dp) + .clip(CircleShape) + .background( + if (isSelected) { + MaterialTheme.colorScheme.primary + } else { + MaterialTheme.colorScheme.primary.copy( + alpha = 0.7f, + ) + }, + ), ) } } diff --git a/android/app/src/main/java/com/atridad/ascently/ui/screens/SettingsScreen.kt b/android/app/src/main/java/com/atridad/ascently/ui/screens/SettingsScreen.kt index d3874ba..dd55a82 100644 --- a/android/app/src/main/java/com/atridad/ascently/ui/screens/SettingsScreen.kt +++ b/android/app/src/main/java/com/atridad/ascently/ui/screens/SettingsScreen.kt @@ -19,9 +19,9 @@ import com.atridad.ascently.R import com.atridad.ascently.ui.components.SyncIndicator import com.atridad.ascently.ui.health.HealthConnectCard import com.atridad.ascently.ui.viewmodel.ClimbViewModel +import kotlinx.coroutines.launch import java.io.File import java.time.Instant -import kotlinx.coroutines.launch @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -64,80 +64,82 @@ fun SettingsScreen(viewModel: ClimbViewModel) { // File picker launcher for import - only accepts ZIP files val importLauncher = - rememberLauncherForActivityResult(contract = ActivityResultContracts.GetContent()) { uri - -> - uri?.let { - try { - val inputStream = context.contentResolver.openInputStream(uri) - // Determine file extension from content resolver - val fileName = - context.contentResolver.query(uri, null, null, null, null)?.use { - cursor -> - val nameIndex = - cursor.getColumnIndex( - android.provider.OpenableColumns.DISPLAY_NAME - ) - if (nameIndex >= 0 && cursor.moveToFirst()) { - cursor.getString(nameIndex) - } else null - } - ?: "import_file" - - // Only allow ZIP files - if (!fileName.lowercase().endsWith(".zip")) { - viewModel.setError( - "Only ZIP files are supported for import. Please use a ZIP file exported from Ascently." - ) - return@let + rememberLauncherForActivityResult(contract = ActivityResultContracts.GetContent()) { uri, + -> + uri?.let { + try { + val inputStream = context.contentResolver.openInputStream(uri) + // Determine file extension from content resolver + val fileName = + context.contentResolver.query(uri, null, null, null, null)?.use { + cursor -> + val nameIndex = + cursor.getColumnIndex( + android.provider.OpenableColumns.DISPLAY_NAME, + ) + if (nameIndex >= 0 && cursor.moveToFirst()) { + cursor.getString(nameIndex) + } else { + null + } } + ?: "import_file" - val tempFile = File(context.cacheDir, "temp_import.zip") - - inputStream?.use { input -> - tempFile.outputStream().use { output -> input.copyTo(output) } - } - viewModel.importData(tempFile) - } catch (e: Exception) { - viewModel.setError("Failed to read file: ${e.message}") + // Only allow ZIP files + if (!fileName.lowercase().endsWith(".zip")) { + viewModel.setError( + "Only ZIP files are supported for import. Please use a ZIP file exported from Ascently.", + ) + return@let } + + val tempFile = File(context.cacheDir, "temp_import.zip") + + inputStream?.use { input -> + tempFile.outputStream().use { output -> input.copyTo(output) } + } + viewModel.importData(tempFile) + } catch (e: Exception) { + viewModel.setError("Failed to read file: ${e.message}") } } + } // File picker launcher for export - ZIP format with images val exportZipLauncher = - rememberLauncherForActivityResult( - contract = ActivityResultContracts.CreateDocument("application/zip") - ) { uri -> - uri?.let { - try { - viewModel.exportDataToZipUri(context, uri) - } catch (e: Exception) { - viewModel.setError("Failed to save file: ${e.message}") - } + rememberLauncherForActivityResult( + contract = ActivityResultContracts.CreateDocument("application/zip"), + ) { uri -> + uri?.let { + try { + viewModel.exportDataToZipUri(context, uri) + } catch (e: Exception) { + viewModel.setError("Failed to save file: ${e.message}") } } + } LazyColumn( - modifier = Modifier.fillMaxSize().padding(16.dp), - verticalArrangement = Arrangement.spacedBy(16.dp) + modifier = Modifier.fillMaxSize().padding(16.dp), + verticalArrangement = Arrangement.spacedBy(16.dp), ) { item { Row( - modifier = Modifier.fillMaxWidth(), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(12.dp) + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(12.dp), ) { Icon( - painter = painterResource(id = R.drawable.ic_mountains), - contentDescription = "Ascently Logo", - modifier = Modifier.size(32.dp), - tint = MaterialTheme.colorScheme.primary + painter = painterResource(id = R.drawable.ic_mountains), + contentDescription = "Ascently Logo", + modifier = Modifier.size(32.dp), + tint = MaterialTheme.colorScheme.primary, ) Text( - text = "Settings", - style = MaterialTheme.typography.headlineMedium, - fontWeight = FontWeight.Bold, - modifier = Modifier.weight(1f) + text = "Settings", + style = MaterialTheme.typography.headlineMedium, + fontWeight = FontWeight.Bold, + modifier = Modifier.weight(1f), ) SyncIndicator(isSyncing = viewModel.syncService.isSyncing) } @@ -148,9 +150,9 @@ fun SettingsScreen(viewModel: ClimbViewModel) { Card(modifier = Modifier.fillMaxWidth(), shape = RoundedCornerShape(16.dp)) { Column(modifier = Modifier.fillMaxWidth().padding(16.dp)) { Text( - text = "Sync", - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.Bold + text = "Sync", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold, ) Spacer(modifier = Modifier.height(12.dp)) @@ -158,84 +160,92 @@ fun SettingsScreen(viewModel: ClimbViewModel) { if (isConfigured) { // Connected state Card( - shape = RoundedCornerShape(12.dp), - colors = - CardDefaults.cardColors( - containerColor = - if (isConnected) - MaterialTheme.colorScheme - .primaryContainer.copy( - alpha = 0.3f - ) - else - MaterialTheme.colorScheme - .surfaceVariant.copy( - alpha = 0.3f - ) + shape = RoundedCornerShape(12.dp), + colors = + CardDefaults.cardColors( + containerColor = + if (isConnected) { + MaterialTheme.colorScheme + .primaryContainer.copy( + alpha = 0.3f, ) + } else { + MaterialTheme.colorScheme + .surfaceVariant.copy( + alpha = 0.3f, + ) + }, + ), ) { ListItem( - headlineContent = { - Text( - if (isConnected) "Connected to Server" - else "Server Configured" - ) - }, - supportingContent = { - Column { - Text("Server: ${syncService.serverUrl}") - lastSyncTime?.let { time -> - Text( - "Last sync: ${ + headlineContent = { + Text( + if (isConnected) { + "Connected to Server" + } else { + "Server Configured" + }, + ) + }, + supportingContent = { + Column { + Text("Server: ${syncService.serverUrl}") + lastSyncTime?.let { time -> + Text( + "Last sync: ${ try { Instant.parse(time).toString() } catch (_: Exception) { time } }", - style = MaterialTheme.typography.bodySmall - ) - } - } - }, - leadingContent = { - Icon( - if (isConnected) Icons.Default.CloudDone - else Icons.Default.Cloud, - contentDescription = null, - tint = - if (isConnected) - MaterialTheme.colorScheme.primary - else - MaterialTheme.colorScheme - .onSurfaceVariant - ) - }, - trailingContent = { - Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { - // Manual Sync Button - TextButton( - onClick = { - viewModel.performManualSync() - }, - enabled = isConnected && !isSyncing - ) { - if (isSyncing) { - CircularProgressIndicator( - modifier = Modifier.size(16.dp), - strokeWidth = 2.dp - ) - } else { - Text("Sync") - } - } - - // Configure Button - TextButton(onClick = { showSyncConfigDialog = true }) { - Text("Configure") - } + style = MaterialTheme.typography.bodySmall, + ) } } + }, + leadingContent = { + Icon( + if (isConnected) { + Icons.Default.CloudDone + } else { + Icons.Default.Cloud + }, + contentDescription = null, + tint = + if (isConnected) { + MaterialTheme.colorScheme.primary + } else { + MaterialTheme.colorScheme + .onSurfaceVariant + }, + ) + }, + trailingContent = { + Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { + // Manual Sync Button + TextButton( + onClick = { + viewModel.performManualSync() + }, + enabled = isConnected && !isSyncing, + ) { + if (isSyncing) { + CircularProgressIndicator( + modifier = Modifier.size(16.dp), + strokeWidth = 2.dp, + ) + } else { + Text("Sync") + } + } + + // Configure Button + TextButton(onClick = { showSyncConfigDialog = true }) { + Text("Configure") + } + } + }, ) } @@ -243,46 +253,46 @@ fun SettingsScreen(viewModel: ClimbViewModel) { // Auto-sync settings Card( - shape = RoundedCornerShape(12.dp), - colors = - CardDefaults.cardColors( - containerColor = - MaterialTheme.colorScheme.surfaceVariant - .copy(alpha = 0.3f) - ) + shape = RoundedCornerShape(12.dp), + colors = + CardDefaults.cardColors( + containerColor = + MaterialTheme.colorScheme.surfaceVariant + .copy(alpha = 0.3f), + ), ) { Column(modifier = Modifier.padding(16.dp)) { Text( - text = "Sync Mode", - style = MaterialTheme.typography.bodyMedium, - fontWeight = FontWeight.Medium + text = "Sync Mode", + style = MaterialTheme.typography.bodyMedium, + fontWeight = FontWeight.Medium, ) Spacer(modifier = Modifier.height(8.dp)) Row( - modifier = Modifier.fillMaxWidth(), - verticalAlignment = Alignment.CenterVertically + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, ) { Column(modifier = Modifier.weight(1f)) { Text("Auto-sync") Text( - text = - "Sync automatically on app launch and data changes", - style = MaterialTheme.typography.bodySmall, - color = - MaterialTheme.colorScheme.onSurface.copy( - alpha = 0.7f - ), - maxLines = 2 + text = + "Sync automatically on app launch and data changes", + style = MaterialTheme.typography.bodySmall, + color = + MaterialTheme.colorScheme.onSurface.copy( + alpha = 0.7f, + ), + maxLines = 2, ) } Spacer(modifier = Modifier.width(16.dp)) Switch( - checked = isAutoSyncEnabled, - onCheckedChange = { enabled -> - syncService.setAutoSyncEnabled(enabled) - } + checked = isAutoSyncEnabled, + onCheckedChange = { enabled -> + syncService.setAutoSyncEnabled(enabled) + }, ) } } @@ -292,58 +302,58 @@ fun SettingsScreen(viewModel: ClimbViewModel) { // Disconnect option Card( - shape = RoundedCornerShape(12.dp), - colors = - CardDefaults.cardColors( - containerColor = - MaterialTheme.colorScheme.errorContainer - .copy(alpha = 0.3f) - ) + shape = RoundedCornerShape(12.dp), + colors = + CardDefaults.cardColors( + containerColor = + MaterialTheme.colorScheme.errorContainer + .copy(alpha = 0.3f), + ), ) { ListItem( - headlineContent = { Text("Disconnect") }, - supportingContent = { Text("Clear sync configuration") }, - leadingContent = { - Icon( - Icons.Default.CloudOff, - contentDescription = null, - tint = MaterialTheme.colorScheme.error + headlineContent = { Text("Disconnect") }, + supportingContent = { Text("Clear sync configuration") }, + leadingContent = { + Icon( + Icons.Default.CloudOff, + contentDescription = null, + tint = MaterialTheme.colorScheme.error, + ) + }, + trailingContent = { + TextButton(onClick = { showDisconnectDialog = true }) { + Text( + "Disconnect", + color = MaterialTheme.colorScheme.error, ) - }, - trailingContent = { - TextButton(onClick = { showDisconnectDialog = true }) { - Text( - "Disconnect", - color = MaterialTheme.colorScheme.error - ) - } } + }, ) } } else { // Not configured state Card( - shape = RoundedCornerShape(12.dp), - colors = - CardDefaults.cardColors( - containerColor = - MaterialTheme.colorScheme.surfaceVariant - .copy(alpha = 0.3f) - ) + shape = RoundedCornerShape(12.dp), + colors = + CardDefaults.cardColors( + containerColor = + MaterialTheme.colorScheme.surfaceVariant + .copy(alpha = 0.3f), + ), ) { ListItem( - headlineContent = { Text("Setup Sync") }, - supportingContent = { - Text("Connect to your Ascently sync server") - }, - leadingContent = { - Icon(Icons.Default.CloudSync, contentDescription = null) - }, - trailingContent = { - TextButton(onClick = { showSyncConfigDialog = true }) { - Text("Setup") - } + headlineContent = { Text("Setup Sync") }, + supportingContent = { + Text("Connect to your Ascently sync server") + }, + leadingContent = { + Icon(Icons.Default.CloudSync, contentDescription = null) + }, + trailingContent = { + TextButton(onClick = { showSyncConfigDialog = true }) { + Text("Setup") } + }, ) } } @@ -352,27 +362,27 @@ fun SettingsScreen(viewModel: ClimbViewModel) { syncError?.let { error -> Spacer(modifier = Modifier.height(8.dp)) Card( - shape = RoundedCornerShape(12.dp), - colors = - CardDefaults.cardColors( - containerColor = - MaterialTheme.colorScheme.errorContainer - ) + shape = RoundedCornerShape(12.dp), + colors = + CardDefaults.cardColors( + containerColor = + MaterialTheme.colorScheme.errorContainer, + ), ) { Row( - modifier = Modifier.fillMaxWidth().padding(12.dp), - verticalAlignment = Alignment.CenterVertically + modifier = Modifier.fillMaxWidth().padding(12.dp), + verticalAlignment = Alignment.CenterVertically, ) { Icon( - Icons.Default.Warning, - contentDescription = null, - tint = MaterialTheme.colorScheme.error + Icons.Default.Warning, + contentDescription = null, + tint = MaterialTheme.colorScheme.error, ) Spacer(modifier = Modifier.width(8.dp)) Text( - text = error, - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onErrorContainer + text = error, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onErrorContainer, ) } } @@ -387,182 +397,182 @@ fun SettingsScreen(viewModel: ClimbViewModel) { Card(modifier = Modifier.fillMaxWidth(), shape = RoundedCornerShape(16.dp)) { Column(modifier = Modifier.fillMaxWidth().padding(16.dp)) { Text( - text = "Data Management", - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.Bold + text = "Data Management", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold, ) Spacer(modifier = Modifier.height(12.dp)) // Export Data Card( - shape = RoundedCornerShape(12.dp), - colors = - CardDefaults.cardColors( - containerColor = - MaterialTheme.colorScheme.surfaceVariant.copy( - alpha = 0.3f - ) - ) + shape = RoundedCornerShape(12.dp), + colors = + CardDefaults.cardColors( + containerColor = + MaterialTheme.colorScheme.surfaceVariant.copy( + alpha = 0.3f, + ), + ), ) { ListItem( - headlineContent = { Text("Export Data with Images") }, - supportingContent = { - Text( - "Export all your climbing data and images to ZIP file (recommended)" - ) - }, - leadingContent = { - Icon(Icons.Default.Share, contentDescription = null) - }, - trailingContent = { - TextButton( - onClick = { - val defaultFileName = - "ascently_export_${ - java.time.LocalDateTime.now() - .toString() - .replace(":", "-") - .replace(".", "-") - }.zip" - exportZipLauncher.launch(defaultFileName) - }, - enabled = !uiState.isLoading - ) { - if (uiState.isLoading) { - CircularProgressIndicator( - modifier = Modifier.size(16.dp), - strokeWidth = 2.dp - ) - } else { - Text("Export ZIP") - } + headlineContent = { Text("Export Data with Images") }, + supportingContent = { + Text( + "Export all your climbing data and images to ZIP file (recommended)", + ) + }, + leadingContent = { + Icon(Icons.Default.Share, contentDescription = null) + }, + trailingContent = { + TextButton( + onClick = { + val defaultFileName = + "ascently_export_${ + java.time.LocalDateTime.now() + .toString() + .replace(":", "-") + .replace(".", "-") + }.zip" + exportZipLauncher.launch(defaultFileName) + }, + enabled = !uiState.isLoading, + ) { + if (uiState.isLoading) { + CircularProgressIndicator( + modifier = Modifier.size(16.dp), + strokeWidth = 2.dp, + ) + } else { + Text("Export ZIP") } } + }, ) } Spacer(modifier = Modifier.height(8.dp)) Card( - shape = RoundedCornerShape(12.dp), - colors = - CardDefaults.cardColors( - containerColor = - MaterialTheme.colorScheme.surfaceVariant.copy( - alpha = 0.3f - ) - ) + shape = RoundedCornerShape(12.dp), + colors = + CardDefaults.cardColors( + containerColor = + MaterialTheme.colorScheme.surfaceVariant.copy( + alpha = 0.3f, + ), + ), ) { ListItem( - headlineContent = { Text("Import Data") }, - supportingContent = { - Text("Import climbing data from ZIP file (recommended format)") - }, - leadingContent = { - Icon(Icons.Default.Add, contentDescription = null) - }, - trailingContent = { - TextButton( - onClick = { importLauncher.launch("application/zip") }, - enabled = !uiState.isLoading - ) { - if (uiState.isLoading) { - CircularProgressIndicator( - modifier = Modifier.size(16.dp), - strokeWidth = 2.dp - ) - } else { - Text("Import") - } + headlineContent = { Text("Import Data") }, + supportingContent = { + Text("Import climbing data from ZIP file (recommended format)") + }, + leadingContent = { + Icon(Icons.Default.Add, contentDescription = null) + }, + trailingContent = { + TextButton( + onClick = { importLauncher.launch("application/zip") }, + enabled = !uiState.isLoading, + ) { + if (uiState.isLoading) { + CircularProgressIndicator( + modifier = Modifier.size(16.dp), + strokeWidth = 2.dp, + ) + } else { + Text("Import") } } + }, ) } Spacer(modifier = Modifier.height(8.dp)) Card( - shape = RoundedCornerShape(12.dp), - colors = - CardDefaults.cardColors( - containerColor = - MaterialTheme.colorScheme.errorContainer.copy( - alpha = 0.3f - ) - ) + shape = RoundedCornerShape(12.dp), + colors = + CardDefaults.cardColors( + containerColor = + MaterialTheme.colorScheme.errorContainer.copy( + alpha = 0.3f, + ), + ), ) { ListItem( - headlineContent = { Text("Delete All Images") }, - supportingContent = { - Text("Permanently delete all image files from device") - }, - leadingContent = { - Icon( - Icons.Default.Delete, - contentDescription = null, - tint = MaterialTheme.colorScheme.error - ) - }, - trailingContent = { - TextButton( - onClick = { showDeleteImagesDialog = true }, - enabled = !isDeletingImages && !uiState.isLoading - ) { - if (isDeletingImages) { - CircularProgressIndicator( - modifier = Modifier.size(16.dp), - strokeWidth = 2.dp - ) - } else { - Text("Delete", color = MaterialTheme.colorScheme.error) - } + headlineContent = { Text("Delete All Images") }, + supportingContent = { + Text("Permanently delete all image files from device") + }, + leadingContent = { + Icon( + Icons.Default.Delete, + contentDescription = null, + tint = MaterialTheme.colorScheme.error, + ) + }, + trailingContent = { + TextButton( + onClick = { showDeleteImagesDialog = true }, + enabled = !isDeletingImages && !uiState.isLoading, + ) { + if (isDeletingImages) { + CircularProgressIndicator( + modifier = Modifier.size(16.dp), + strokeWidth = 2.dp, + ) + } else { + Text("Delete", color = MaterialTheme.colorScheme.error) } } + }, ) } Spacer(modifier = Modifier.height(8.dp)) Card( - shape = RoundedCornerShape(12.dp), - colors = - CardDefaults.cardColors( - containerColor = - MaterialTheme.colorScheme.errorContainer.copy( - alpha = 0.3f - ) - ) + shape = RoundedCornerShape(12.dp), + colors = + CardDefaults.cardColors( + containerColor = + MaterialTheme.colorScheme.errorContainer.copy( + alpha = 0.3f, + ), + ), ) { ListItem( - headlineContent = { Text("Reset All Data") }, - supportingContent = { - Text( - "Permanently delete all gyms, problems, sessions, attempts, and images" - ) - }, - leadingContent = { - Icon( - Icons.Default.Delete, - contentDescription = null, - tint = MaterialTheme.colorScheme.error - ) - }, - trailingContent = { - TextButton( - onClick = { showResetDialog = true }, - enabled = !uiState.isLoading - ) { - if (uiState.isLoading) { - CircularProgressIndicator( - modifier = Modifier.size(16.dp), - strokeWidth = 2.dp - ) - } else { - Text("Reset", color = MaterialTheme.colorScheme.error) - } + headlineContent = { Text("Reset All Data") }, + supportingContent = { + Text( + "Permanently delete all gyms, problems, sessions, attempts, and images", + ) + }, + leadingContent = { + Icon( + Icons.Default.Delete, + contentDescription = null, + tint = MaterialTheme.colorScheme.error, + ) + }, + trailingContent = { + TextButton( + onClick = { showResetDialog = true }, + enabled = !uiState.isLoading, + ) { + if (uiState.isLoading) { + CircularProgressIndicator( + modifier = Modifier.size(16.dp), + strokeWidth = 2.dp, + ) + } else { + Text("Reset", color = MaterialTheme.colorScheme.error) } } + }, ) } } @@ -574,29 +584,29 @@ fun SettingsScreen(viewModel: ClimbViewModel) { Card(modifier = Modifier.fillMaxWidth(), shape = RoundedCornerShape(16.dp)) { Column(modifier = Modifier.fillMaxWidth().padding(16.dp)) { Text( - text = "App Information", - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.Bold + text = "App Information", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold, ) Spacer(modifier = Modifier.height(12.dp)) Card( - shape = RoundedCornerShape(12.dp), - colors = - CardDefaults.cardColors( - containerColor = - MaterialTheme.colorScheme.surfaceVariant.copy( - alpha = 0.3f - ) - ) + shape = RoundedCornerShape(12.dp), + colors = + CardDefaults.cardColors( + containerColor = + MaterialTheme.colorScheme.surfaceVariant.copy( + alpha = 0.3f, + ), + ), ) { ListItem( - headlineContent = { Text("Version") }, - supportingContent = { Text(appVersion ?: "Unknown") }, - leadingContent = { - Icon(Icons.Default.Info, contentDescription = null) - } + headlineContent = { Text("Version") }, + supportingContent = { Text(appVersion ?: "Unknown") }, + leadingContent = { + Icon(Icons.Default.Info, contentDescription = null) + }, ) } } @@ -618,27 +628,27 @@ fun SettingsScreen(viewModel: ClimbViewModel) { } Card( - modifier = Modifier.fillMaxWidth().padding(16.dp), - colors = - CardDefaults.cardColors( - containerColor = MaterialTheme.colorScheme.primaryContainer - ), - shape = RoundedCornerShape(12.dp) + modifier = Modifier.fillMaxWidth().padding(16.dp), + colors = + CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.primaryContainer, + ), + shape = RoundedCornerShape(12.dp), ) { Row( - modifier = Modifier.fillMaxWidth().padding(16.dp), - verticalAlignment = Alignment.CenterVertically + modifier = Modifier.fillMaxWidth().padding(16.dp), + verticalAlignment = Alignment.CenterVertically, ) { Icon( - Icons.Default.CheckCircle, - contentDescription = null, - tint = MaterialTheme.colorScheme.primary + Icons.Default.CheckCircle, + contentDescription = null, + tint = MaterialTheme.colorScheme.primary, ) Spacer(modifier = Modifier.width(8.dp)) Text( - text = message, - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onPrimaryContainer + text = message, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onPrimaryContainer, ) } } @@ -651,27 +661,27 @@ fun SettingsScreen(viewModel: ClimbViewModel) { } Card( - modifier = Modifier.fillMaxWidth().padding(16.dp), - colors = - CardDefaults.cardColors( - containerColor = MaterialTheme.colorScheme.errorContainer - ), - shape = RoundedCornerShape(12.dp) + modifier = Modifier.fillMaxWidth().padding(16.dp), + colors = + CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.errorContainer, + ), + shape = RoundedCornerShape(12.dp), ) { Row( - modifier = Modifier.fillMaxWidth().padding(16.dp), - verticalAlignment = Alignment.CenterVertically + modifier = Modifier.fillMaxWidth().padding(16.dp), + verticalAlignment = Alignment.CenterVertically, ) { Icon( - Icons.Default.Warning, - contentDescription = null, - tint = MaterialTheme.colorScheme.error + Icons.Default.Warning, + contentDescription = null, + tint = MaterialTheme.colorScheme.error, ) Spacer(modifier = Modifier.width(8.dp)) Text( - text = error, - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onErrorContainer + text = error, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onErrorContainer, ) } } @@ -680,280 +690,283 @@ fun SettingsScreen(viewModel: ClimbViewModel) { // Reset confirmation dialog if (showResetDialog) { AlertDialog( - onDismissRequest = { showResetDialog = false }, - title = { Text("Reset All Data") }, - text = { - Column { - Text("Are you sure you want to reset all data?") - Spacer(modifier = Modifier.height(8.dp)) - Text( - text = "This will permanently delete:", - style = MaterialTheme.typography.bodySmall, - fontWeight = FontWeight.Medium - ) - Spacer(modifier = Modifier.height(4.dp)) - Text( - text = - "• All gyms and their information\n• All problems and their images\n• All climbing sessions\n• All attempts and progress data", - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.error - ) - Spacer(modifier = Modifier.height(8.dp)) - Text( - text = - "This action cannot be undone. Consider exporting your data first.", - style = MaterialTheme.typography.bodySmall, - fontWeight = FontWeight.Medium, - color = MaterialTheme.colorScheme.error - ) - } - }, - confirmButton = { - TextButton( - onClick = { - viewModel.resetAllData() - showResetDialog = false - } - ) { Text("Reset All Data", color = MaterialTheme.colorScheme.error) } - }, - dismissButton = { - TextButton(onClick = { showResetDialog = false }) { Text("Cancel") } + onDismissRequest = { showResetDialog = false }, + title = { Text("Reset All Data") }, + text = { + Column { + Text("Are you sure you want to reset all data?") + Spacer(modifier = Modifier.height(8.dp)) + Text( + text = "This will permanently delete:", + style = MaterialTheme.typography.bodySmall, + fontWeight = FontWeight.Medium, + ) + Spacer(modifier = Modifier.height(4.dp)) + Text( + text = + "• All gyms and their information\n• All problems and their images\n• All climbing sessions\n• All attempts and progress data", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.error, + ) + Spacer(modifier = Modifier.height(8.dp)) + Text( + text = + "This action cannot be undone. Consider exporting your data first.", + style = MaterialTheme.typography.bodySmall, + fontWeight = FontWeight.Medium, + color = MaterialTheme.colorScheme.error, + ) } + }, + confirmButton = { + TextButton( + onClick = { + viewModel.resetAllData() + showResetDialog = false + }, + ) { Text("Reset All Data", color = MaterialTheme.colorScheme.error) } + }, + dismissButton = { + TextButton(onClick = { showResetDialog = false }) { Text("Cancel") } + }, ) } // Sync Configuration Dialog if (showSyncConfigDialog) { AlertDialog( - onDismissRequest = { showSyncConfigDialog = false }, - title = { Text("Sync Configuration") }, - text = { - Column { - OutlinedTextField( - value = serverUrl, - onValueChange = { serverUrl = it }, - label = { Text("Server URL") }, - placeholder = { Text("https://your-server.com") }, - modifier = Modifier.fillMaxWidth(), - singleLine = true - ) + onDismissRequest = { showSyncConfigDialog = false }, + title = { Text("Sync Configuration") }, + text = { + Column { + OutlinedTextField( + value = serverUrl, + onValueChange = { serverUrl = it }, + label = { Text("Server URL") }, + placeholder = { Text("https://your-server.com") }, + modifier = Modifier.fillMaxWidth(), + singleLine = true, + ) - Spacer(modifier = Modifier.height(8.dp)) + Spacer(modifier = Modifier.height(8.dp)) - OutlinedTextField( - value = authToken, - onValueChange = { authToken = it }, - label = { Text("Auth Token") }, - placeholder = { Text("your-secret-token") }, - modifier = Modifier.fillMaxWidth(), - singleLine = true - ) + OutlinedTextField( + value = authToken, + onValueChange = { authToken = it }, + label = { Text("Auth Token") }, + placeholder = { Text("your-secret-token") }, + modifier = Modifier.fillMaxWidth(), + singleLine = true, + ) - Spacer(modifier = Modifier.height(16.dp)) + Spacer(modifier = Modifier.height(16.dp)) - // Connection status indicator - if (isTesting) { - Row( - verticalAlignment = Alignment.CenterVertically, - modifier = Modifier.fillMaxWidth() - ) { - CircularProgressIndicator( - modifier = Modifier.size(16.dp), - strokeWidth = 2.dp - ) - Spacer(modifier = Modifier.width(8.dp)) - Text( - text = "Testing connection...", - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.primary - ) - } - } else if (isConnected && isConfigured) { - Row( - verticalAlignment = Alignment.CenterVertically, - modifier = Modifier.fillMaxWidth() - ) { - Icon( - Icons.Default.CheckCircle, - contentDescription = null, - tint = MaterialTheme.colorScheme.primary, - modifier = Modifier.size(16.dp) - ) - Spacer(modifier = Modifier.width(8.dp)) - Text( - text = "Connection successful", - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.primary - ) - } - } else if (syncError != null && isConfigured) { - Row( - verticalAlignment = Alignment.CenterVertically, - modifier = Modifier.fillMaxWidth() - ) { - Icon( - Icons.Default.Error, - contentDescription = null, - tint = MaterialTheme.colorScheme.error, - modifier = Modifier.size(16.dp) - ) - Spacer(modifier = Modifier.width(8.dp)) - Text( - text = "Connection failed: $syncError", - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.error - ) - } - } else if (isConfigured) { - Text( - text = "Test connection before enabling sync features", - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant + // Connection status indicator + if (isTesting) { + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.fillMaxWidth(), + ) { + CircularProgressIndicator( + modifier = Modifier.size(16.dp), + strokeWidth = 2.dp, ) - } else { + Spacer(modifier = Modifier.width(8.dp)) Text( - text = "Enter your server URL and auth token to enable sync", - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant + text = "Testing connection...", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.primary, ) } - } - }, - confirmButton = { - Row { - // Primary action: Save & Test - Button( - onClick = { - coroutineScope.launch { - try { - syncService.serverUrl = serverUrl.trim() - syncService.authToken = authToken.trim() - viewModel.testSyncConnection() - while (syncService.isTesting.value) { - kotlinx.coroutines.delay(100) - } - showSyncConfigDialog = false - } catch (e: Exception) { - viewModel.setError( - "Failed to save and test: ${e.message}" - ) - } - } - }, - enabled = - !isTesting && - serverUrl.isNotBlank() && - authToken.isNotBlank() + } else if (isConnected && isConfigured) { + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.fillMaxWidth(), ) { - if (isTesting) { - Row(verticalAlignment = Alignment.CenterVertically) { - CircularProgressIndicator( - modifier = Modifier.size(16.dp), - strokeWidth = 2.dp, - color = MaterialTheme.colorScheme.onPrimary + Icon( + Icons.Default.CheckCircle, + contentDescription = null, + tint = MaterialTheme.colorScheme.primary, + modifier = Modifier.size(16.dp), + ) + Spacer(modifier = Modifier.width(8.dp)) + Text( + text = "Connection successful", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.primary, + ) + } + } else if (syncError != null && isConfigured) { + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.fillMaxWidth(), + ) { + Icon( + Icons.Default.Error, + contentDescription = null, + tint = MaterialTheme.colorScheme.error, + modifier = Modifier.size(16.dp), + ) + Spacer(modifier = Modifier.width(8.dp)) + Text( + text = "Connection failed: $syncError", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.error, + ) + } + } else if (isConfigured) { + Text( + text = "Test connection before enabling sync features", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } else { + Text( + text = "Enter your server URL and auth token to enable sync", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + } + }, + confirmButton = { + Row { + // Primary action: Save & Test + Button( + onClick = { + coroutineScope.launch { + try { + syncService.serverUrl = serverUrl.trim() + syncService.authToken = authToken.trim() + viewModel.testSyncConnection() + while (syncService.isTesting.value) { + kotlinx.coroutines.delay(100) + } + showSyncConfigDialog = false + } catch (e: Exception) { + viewModel.setError( + "Failed to save and test: ${e.message}", ) - Spacer(modifier = Modifier.width(8.dp)) - Text("Save & Test") } - } else { + } + }, + enabled = + !isTesting && + serverUrl.isNotBlank() && + authToken.isNotBlank(), + ) { + if (isTesting) { + Row(verticalAlignment = Alignment.CenterVertically) { + CircularProgressIndicator( + modifier = Modifier.size(16.dp), + strokeWidth = 2.dp, + color = MaterialTheme.colorScheme.onPrimary, + ) + Spacer(modifier = Modifier.width(8.dp)) Text("Save & Test") } - } - - Spacer(modifier = Modifier.width(8.dp)) - - // Secondary action: Test only (when already configured) - if (isConfigured) { - TextButton( - onClick = { - coroutineScope.launch { - try { - syncService.serverUrl = serverUrl.trim() - syncService.authToken = authToken.trim() - viewModel.testSyncConnection() - while (syncService.isTesting.value) { - kotlinx.coroutines.delay(100) - } - if (isConnected) { - showSyncConfigDialog = false - } - } catch (e: Exception) { - viewModel.setError( - "Connection test failed: ${e.message}" - ) - } - } - }, - enabled = - !isTesting && - serverUrl.isNotBlank() && - authToken.isNotBlank() - ) { Text("Test Only") } + } else { + Text("Save & Test") } } - }, - dismissButton = { - TextButton( + + Spacer(modifier = Modifier.width(8.dp)) + + // Secondary action: Test only (when already configured) + if (isConfigured) { + TextButton( onClick = { - serverUrl = syncService.serverUrl - authToken = syncService.authToken - showSyncConfigDialog = false - } - ) { Text("Cancel") } + coroutineScope.launch { + try { + syncService.serverUrl = serverUrl.trim() + syncService.authToken = authToken.trim() + viewModel.testSyncConnection() + while (syncService.isTesting.value) { + kotlinx.coroutines.delay(100) + } + if (isConnected) { + showSyncConfigDialog = false + } + } catch (e: Exception) { + viewModel.setError( + "Connection test failed: ${e.message}", + ) + } + } + }, + enabled = + !isTesting && + serverUrl.isNotBlank() && + authToken.isNotBlank(), + ) { Text("Test Only") } + } } + }, + dismissButton = { + TextButton( + onClick = { + serverUrl = syncService.serverUrl + authToken = syncService.authToken + showSyncConfigDialog = false + }, + ) { Text("Cancel") } + }, ) } // Disconnect Dialog if (showDisconnectDialog) { AlertDialog( - onDismissRequest = { showDisconnectDialog = false }, - title = { Text("Disconnect from Sync") }, - text = { - Text( - "Are you sure you want to disconnect from the sync server? This will clear your server configuration and disable auto-sync." - ) - }, - confirmButton = { - TextButton( - onClick = { - viewModel.syncService.clearConfiguration() - showDisconnectDialog = false - } - ) { Text("Disconnect") } - }, - dismissButton = { - TextButton(onClick = { showDisconnectDialog = false }) { Text("Cancel") } - } + onDismissRequest = { showDisconnectDialog = false }, + title = { Text("Disconnect from Sync") }, + text = { + Text( + "Are you sure you want to disconnect from the sync server? This will clear your server configuration and disable auto-sync.", + ) + }, + confirmButton = { + TextButton( + onClick = { + viewModel.syncService.clearConfiguration() + showDisconnectDialog = false + }, + ) { Text("Disconnect") } + }, + dismissButton = { + TextButton(onClick = { showDisconnectDialog = false }) { Text("Cancel") } + }, ) } // Delete All Images dialog if (showDeleteImagesDialog) { AlertDialog( - onDismissRequest = { showDeleteImagesDialog = false }, - title = { Text("Delete All Images") }, - text = { - Text( - "This will permanently delete ALL image files from your device.\n\nProblems will keep their references but the actual image files will be removed. This cannot be undone.\n\nConsider exporting your data first if you want to keep your images." - ) - }, - confirmButton = { - TextButton( - onClick = { - isDeletingImages = true - showDeleteImagesDialog = false - coroutineScope.launch { - viewModel.deleteAllImages() - isDeletingImages = false - viewModel.setMessage("All images deleted successfully!") - } - } - ) { Text("Delete", color = MaterialTheme.colorScheme.error) } - }, - dismissButton = { - TextButton(onClick = { showDeleteImagesDialog = false }) { Text("Cancel") } - } + onDismissRequest = { showDeleteImagesDialog = false }, + title = { Text("Delete All Images") }, + text = { + Text( + "This will permanently delete ALL image files from your device." + + "\n\nProblems will keep their references but the actual image files " + + "will be removed. This cannot be undone." + + "\n\nConsider exporting your data first if you want to keep your images.", + ) + }, + confirmButton = { + TextButton( + onClick = { + isDeletingImages = true + showDeleteImagesDialog = false + coroutineScope.launch { + viewModel.deleteAllImages() + isDeletingImages = false + viewModel.setMessage("All images deleted successfully!") + } + }, + ) { Text("Delete", color = MaterialTheme.colorScheme.error) } + }, + dismissButton = { + TextButton(onClick = { showDeleteImagesDialog = false }) { Text("Cancel") } + }, ) } } diff --git a/android/app/src/main/java/com/atridad/ascently/ui/theme/Color.kt b/android/app/src/main/java/com/atridad/ascently/ui/theme/Color.kt index 06a7993..760a994 100644 --- a/android/app/src/main/java/com/atridad/ascently/ui/theme/Color.kt +++ b/android/app/src/main/java/com/atridad/ascently/ui/theme/Color.kt @@ -63,4 +63,4 @@ val ClimbNeutralVariant30 = Color(0xFF484848) val ClimbNeutralVariant50 = Color(0xFF797979) val ClimbNeutralVariant60 = Color(0xFF939393) val ClimbNeutralVariant80 = Color(0xFFC7C7C7) -val ClimbNeutralVariant90 = Color(0xFFE3E3E3) \ No newline at end of file +val ClimbNeutralVariant90 = Color(0xFFE3E3E3) diff --git a/android/app/src/main/java/com/atridad/ascently/ui/theme/CustomIcons.kt b/android/app/src/main/java/com/atridad/ascently/ui/theme/CustomIcons.kt index ba536ef..25a74ca 100644 --- a/android/app/src/main/java/com/atridad/ascently/ui/theme/CustomIcons.kt +++ b/android/app/src/main/java/com/atridad/ascently/ui/theme/CustomIcons.kt @@ -12,9 +12,9 @@ object CustomIcons { defaultWidth = 24.dp, defaultHeight = 24.dp, viewportWidth = 24f, - viewportHeight = 24f + viewportHeight = 24f, ).path( - fill = SolidColor(color) + fill = SolidColor(color), ) { moveTo(6f, 6f) horizontalLineTo(18f) diff --git a/android/app/src/main/java/com/atridad/ascently/ui/theme/Theme.kt b/android/app/src/main/java/com/atridad/ascently/ui/theme/Theme.kt index 2c137da..7531af1 100644 --- a/android/app/src/main/java/com/atridad/ascently/ui/theme/Theme.kt +++ b/android/app/src/main/java/com/atridad/ascently/ui/theme/Theme.kt @@ -47,7 +47,7 @@ private val DarkColorScheme = darkColorScheme( surfaceContainerLow = ClimbNeutral10, surfaceContainer = ClimbNeutral12, surfaceContainerHigh = ClimbNeutral17, - surfaceContainerHighest = ClimbNeutral22 + surfaceContainerHighest = ClimbNeutral22, ) // Climbing-themed light color scheme with full Material You compatibility @@ -84,7 +84,7 @@ private val LightColorScheme = lightColorScheme( surfaceContainerLow = ClimbNeutral96, surfaceContainer = ClimbNeutral94, surfaceContainerHigh = ClimbNeutral92, - surfaceContainerHighest = ClimbNeutral90 + surfaceContainerHighest = ClimbNeutral90, ) @Composable @@ -93,7 +93,7 @@ fun AscentlyTheme( // Dynamic color is available on Android 12+ and provides full Material You theming // When enabled, it adapts to the user's system wallpaper colors dynamicColor: Boolean = true, - content: @Composable () -> Unit + content: @Composable () -> Unit, ) { val colorScheme = when { dynamicColor && true -> { @@ -103,7 +103,7 @@ fun AscentlyTheme( darkTheme -> DarkColorScheme else -> LightColorScheme } - + val view = LocalView.current if (!view.isInEditMode) { SideEffect { @@ -116,6 +116,6 @@ fun AscentlyTheme( MaterialTheme( colorScheme = colorScheme, typography = Typography, - content = content + content = content, ) -} \ No newline at end of file +} diff --git a/android/app/src/main/java/com/atridad/ascently/ui/theme/Type.kt b/android/app/src/main/java/com/atridad/ascently/ui/theme/Type.kt index faa4bbb..e56eeec 100644 --- a/android/app/src/main/java/com/atridad/ascently/ui/theme/Type.kt +++ b/android/app/src/main/java/com/atridad/ascently/ui/theme/Type.kt @@ -13,6 +13,6 @@ val Typography = Typography( fontWeight = FontWeight.Normal, fontSize = 16.sp, lineHeight = 24.sp, - letterSpacing = 0.5.sp - ) -) \ No newline at end of file + letterSpacing = 0.5.sp, + ), +) diff --git a/android/app/src/main/java/com/atridad/ascently/ui/viewmodel/ClimbViewModel.kt b/android/app/src/main/java/com/atridad/ascently/ui/viewmodel/ClimbViewModel.kt index 06ee5a8..e9eddf7 100644 --- a/android/app/src/main/java/com/atridad/ascently/ui/viewmodel/ClimbViewModel.kt +++ b/android/app/src/main/java/com/atridad/ascently/ui/viewmodel/ClimbViewModel.kt @@ -11,14 +11,14 @@ import com.atridad.ascently.service.SessionTrackingService import com.atridad.ascently.utils.AppLogger import com.atridad.ascently.utils.ImageUtils import com.atridad.ascently.widget.ClimbStatsWidgetProvider -import java.io.File import kotlinx.coroutines.flow.* import kotlinx.coroutines.launch +import java.io.File class ClimbViewModel( private val repository: ClimbRepository, val syncService: SyncService, - private val context: Context + private val context: Context, ) : ViewModel() { // Health Connect manager @@ -35,7 +35,7 @@ class ClimbViewModel( .stateIn( scope = viewModelScope, started = SharingStarted.WhileSubscribed(), - initialValue = emptyList() + initialValue = emptyList(), ) val problems = @@ -44,7 +44,7 @@ class ClimbViewModel( .stateIn( scope = viewModelScope, started = SharingStarted.WhileSubscribed(), - initialValue = emptyList() + initialValue = emptyList(), ) val sessions = @@ -53,7 +53,7 @@ class ClimbViewModel( .stateIn( scope = viewModelScope, started = SharingStarted.WhileSubscribed(), - initialValue = emptyList() + initialValue = emptyList(), ) val activeSession = @@ -62,7 +62,7 @@ class ClimbViewModel( .stateIn( scope = viewModelScope, started = SharingStarted.WhileSubscribed(), - initialValue = null + initialValue = null, ) val attempts = @@ -71,7 +71,7 @@ class ClimbViewModel( .stateIn( scope = viewModelScope, started = SharingStarted.WhileSubscribed(), - initialValue = emptyList() + initialValue = emptyList(), ) // Gym operations @@ -243,7 +243,7 @@ class ClimbViewModel( _uiState.value = _uiState.value.copy( error = - "Notification permission is required to track your climbing session. Please enable notifications in settings." + "Notification permission is required to track your climbing session. Please enable notifications in settings.", ) return@launch } @@ -253,7 +253,7 @@ class ClimbViewModel( AppLogger.d("ClimbViewModel") { "Active session already exists: ${existingActive.id}" } _uiState.value = _uiState.value.copy( - error = "There's already an active session. Please end it first." + error = "There's already an active session. Please end it first.", ) return@launch } @@ -281,7 +281,7 @@ class ClimbViewModel( _uiState.value = _uiState.value.copy( error = - "Notification permission is required to manage your climbing session. Please enable notifications in settings." + "Notification permission is required to manage your climbing session. Please enable notifications in settings.", ) return@launch } @@ -354,20 +354,20 @@ class ClimbViewModel( _uiState.value = _uiState.value.copy( isLoading = true, - message = "Creating ZIP file with images..." + message = "Creating ZIP file with images...", ) repository.exportAllDataToZipUri(context, uri) _uiState.value = _uiState.value.copy( isLoading = false, message = - "Export complete! Your climbing data and images have been saved." + "Export complete! Your climbing data and images have been saved.", ) } catch (e: Exception) { _uiState.value = _uiState.value.copy( isLoading = false, - error = "Export failed: ${e.message}" + error = "Export failed: ${e.message}", ) } } @@ -380,7 +380,7 @@ class ClimbViewModel( if (!file.name.lowercase().endsWith(".zip")) { throw Exception( - "Only ZIP files are supported for import. Please use a ZIP file exported from Ascently." + "Only ZIP files are supported for import. Please use a ZIP file exported from Ascently.", ) } @@ -389,13 +389,13 @@ class ClimbViewModel( _uiState.value = _uiState.value.copy( isLoading = false, - message = "Data imported successfully from ${file.name}" + message = "Data imported successfully from ${file.name}", ) } catch (e: Exception) { _uiState.value = _uiState.value.copy( isLoading = false, - error = "Import failed: ${e.message}" + error = "Import failed: ${e.message}", ) } } @@ -447,7 +447,7 @@ class ClimbViewModel( _uiState.value = _uiState.value.copy( isLoading = false, - message = "All data has been reset successfully" + message = "All data has been reset successfully", ) } catch (e: Exception) { _uiState.value = @@ -469,7 +469,7 @@ class ClimbViewModel( healthConnectManager.autoSyncCompletedSession( session, gymName, - attemptCount + attemptCount, ) result.onFailure { error -> @@ -489,5 +489,5 @@ class ClimbViewModel( data class ClimbUiState( val isLoading: Boolean = false, val message: String? = null, - val error: String? = null + val error: String? = null, ) diff --git a/android/app/src/main/java/com/atridad/ascently/ui/viewmodel/ClimbViewModelFactory.kt b/android/app/src/main/java/com/atridad/ascently/ui/viewmodel/ClimbViewModelFactory.kt index 237048f..a17e5a0 100644 --- a/android/app/src/main/java/com/atridad/ascently/ui/viewmodel/ClimbViewModelFactory.kt +++ b/android/app/src/main/java/com/atridad/ascently/ui/viewmodel/ClimbViewModelFactory.kt @@ -7,9 +7,9 @@ import com.atridad.ascently.data.repository.ClimbRepository import com.atridad.ascently.data.sync.SyncService class ClimbViewModelFactory( - private val repository: ClimbRepository, - private val syncService: SyncService, - private val context: Context + private val repository: ClimbRepository, + private val syncService: SyncService, + private val context: Context, ) : ViewModelProvider.Factory { @Suppress("UNCHECKED_CAST") diff --git a/android/app/src/main/java/com/atridad/ascently/utils/AppLogger.kt b/android/app/src/main/java/com/atridad/ascently/utils/AppLogger.kt index ebcec39..94d0366 100644 --- a/android/app/src/main/java/com/atridad/ascently/utils/AppLogger.kt +++ b/android/app/src/main/java/com/atridad/ascently/utils/AppLogger.kt @@ -11,7 +11,7 @@ object AppLogger { DEBUG(Log.DEBUG), INFO(Log.INFO), WARN(Log.WARN), - ERROR(Log.ERROR) + ERROR(Log.ERROR), } fun d(tag: String = DEFAULT_TAG, messageProvider: () -> String) { @@ -34,7 +34,7 @@ object AppLogger { level: Level, tag: String, messageProvider: () -> String, - throwable: Throwable? = null + throwable: Throwable? = null, ) { if (!BuildConfig.DEBUG) return diff --git a/android/app/src/main/java/com/atridad/ascently/utils/DateFormatUtils.kt b/android/app/src/main/java/com/atridad/ascently/utils/DateFormatUtils.kt index 915990c..8453792 100644 --- a/android/app/src/main/java/com/atridad/ascently/utils/DateFormatUtils.kt +++ b/android/app/src/main/java/com/atridad/ascently/utils/DateFormatUtils.kt @@ -10,7 +10,7 @@ object DateFormatUtils { // ISO 8601 formatter matching iOS date format exactly private val ISO_FORMATTER = - DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSX").withZone(ZoneOffset.UTC) + DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSX").withZone(ZoneOffset.UTC) /** Get current timestamp in iOS-compatible ISO 8601 format */ fun nowISO8601(): String { @@ -22,7 +22,6 @@ object DateFormatUtils { return try { Instant.from(ISO_FORMATTER.parse(dateString)) } catch (_: Exception) { - try { Instant.parse(dateString) } catch (_: Exception) { diff --git a/android/app/src/main/java/com/atridad/ascently/utils/ImageNamingUtils.kt b/android/app/src/main/java/com/atridad/ascently/utils/ImageNamingUtils.kt index 954c4d1..3c6ea19 100644 --- a/android/app/src/main/java/com/atridad/ascently/utils/ImageNamingUtils.kt +++ b/android/app/src/main/java/com/atridad/ascently/utils/ImageNamingUtils.kt @@ -13,7 +13,7 @@ object ImageNamingUtils { /** Generates a deterministic filename for a problem image */ fun generateImageFilename(problemId: String, imageIndex: Int): String { - val input = "${problemId}_${imageIndex}" + val input = "${problemId}_$imageIndex" val hash = createHash(input) return "problem_${hash}_${imageIndex}${IMAGE_EXTENSION}" diff --git a/android/app/src/main/java/com/atridad/ascently/utils/ImageUtils.kt b/android/app/src/main/java/com/atridad/ascently/utils/ImageUtils.kt index 10c3b91..99db803 100644 --- a/android/app/src/main/java/com/atridad/ascently/utils/ImageUtils.kt +++ b/android/app/src/main/java/com/atridad/ascently/utils/ImageUtils.kt @@ -32,7 +32,7 @@ object ImageUtils { context: Context, imageUri: Uri, originalBitmap: Bitmap, - outputFile: File + outputFile: File, ): Boolean { return try { // Get EXIF data from original image @@ -147,12 +147,16 @@ object ImageUtils { val imagesDir = getImagesDirectory(context) imagesDir.listFiles()?.mapNotNull { file -> if (file.isFile && - (file.extension == "jpg" || + ( + file.extension == "jpg" || file.extension == "jpeg" || - file.extension == "png") + file.extension == "png" + ) ) { "$IMAGES_DIR/${file.name}" - } else null + } else { + null + } } ?: emptyList() } catch (e: Exception) { @@ -187,7 +191,7 @@ object ImageUtils { context: Context, tempFilename: String, problemId: String, - imageIndex: Int + imageIndex: Int, ): String? { return try { val tempFile = File(getImagesDirectory(context), tempFilename) @@ -217,7 +221,7 @@ object ImageUtils { fun saveImageFromBytesWithFilename( context: Context, imageData: ByteArray, - filename: String + filename: String, ): String? { return try { val imageFile = File(getImagesDirectory(context), filename) diff --git a/android/app/src/main/java/com/atridad/ascently/utils/MigrationManager.kt b/android/app/src/main/java/com/atridad/ascently/utils/MigrationManager.kt index 5bc3496..69ccc0b 100644 --- a/android/app/src/main/java/com/atridad/ascently/utils/MigrationManager.kt +++ b/android/app/src/main/java/com/atridad/ascently/utils/MigrationManager.kt @@ -51,7 +51,7 @@ class MigrationManager(private val context: Context) { "openclimb_data_state" to "ascently_data_state", "health_connect_prefs" to "health_connect_prefs", // Keep same name "deleted_items" to "deleted_items", // Keep same name - "sync_preferences" to "sync_preferences" // Keep same name + "sync_preferences" to "sync_preferences", // Keep same name ) for ((oldFileName, newFileName) in preferenceFileMigrations) { @@ -82,7 +82,8 @@ class MigrationManager(private val context: Context) { is Float -> putFloat(key, value) is Boolean -> putBoolean(key, value) is Set<*> -> { - @Suppress("UNCHECKED_CAST") putStringSet(key, value as Set) + @Suppress("UNCHECKED_CAST") + putStringSet(key, value as Set) } } } @@ -108,7 +109,7 @@ class MigrationManager(private val context: Context) { "ascently_data_state", "health_connect_prefs", "deleted_items", - "sync_preferences" + "sync_preferences", ) for (prefFileName in preferencesToCheck) { diff --git a/android/app/src/main/java/com/atridad/ascently/utils/NotificationPermissionUtils.kt b/android/app/src/main/java/com/atridad/ascently/utils/NotificationPermissionUtils.kt index 50b4c7f..0c9583f 100644 --- a/android/app/src/main/java/com/atridad/ascently/utils/NotificationPermissionUtils.kt +++ b/android/app/src/main/java/com/atridad/ascently/utils/NotificationPermissionUtils.kt @@ -6,24 +6,24 @@ import android.content.pm.PackageManager import androidx.core.content.ContextCompat object NotificationPermissionUtils { - + /** * Check if notification permission is granted */ fun isNotificationPermissionGranted(context: Context): Boolean { return ContextCompat.checkSelfPermission( context, - Manifest.permission.POST_NOTIFICATIONS + Manifest.permission.POST_NOTIFICATIONS, ) == PackageManager.PERMISSION_GRANTED } - + /** * Check if notification permission should be requested */ fun shouldRequestNotificationPermission(): Boolean { return true } - + /** * Get the notification permission string */ diff --git a/android/app/src/main/java/com/atridad/ascently/utils/ShortcutManager.kt b/android/app/src/main/java/com/atridad/ascently/utils/ShortcutManager.kt index 94b64de..5799245 100644 --- a/android/app/src/main/java/com/atridad/ascently/utils/ShortcutManager.kt +++ b/android/app/src/main/java/com/atridad/ascently/utils/ShortcutManager.kt @@ -20,10 +20,10 @@ object AppShortcutManager { /** Updates the app shortcuts based on current session state */ fun updateShortcuts( - context: Context, - hasActiveSession: Boolean, - hasGyms: Boolean, - lastUsedGym: com.atridad.ascently.data.model.Gym? = null + context: Context, + hasActiveSession: Boolean, + hasGyms: Boolean, + lastUsedGym: com.atridad.ascently.data.model.Gym? = null, ) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) { val shortcutManager = context.getSystemService(ShortcutManager::class.java) @@ -44,52 +44,52 @@ object AppShortcutManager { @RequiresApi(Build.VERSION_CODES.N_MR1) private fun createStartSessionShortcut( - context: Context, - lastUsedGym: com.atridad.ascently.data.model.Gym? = null + context: Context, + lastUsedGym: com.atridad.ascently.data.model.Gym? = null, ): ShortcutInfo { val startIntent = - Intent(context, MainActivity::class.java).apply { - action = ACTION_START_SESSION - flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP - lastUsedGym?.let { gym -> putExtra("LAST_USED_GYM_ID", gym.id) } - } + Intent(context, MainActivity::class.java).apply { + action = ACTION_START_SESSION + flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP + lastUsedGym?.let { gym -> putExtra("LAST_USED_GYM_ID", gym.id) } + } val shortLabel = - if (lastUsedGym != null) { - "Start at ${lastUsedGym.name}" - } else { - context.getString(R.string.shortcut_start_session_short) - } + if (lastUsedGym != null) { + "Start at ${lastUsedGym.name}" + } else { + context.getString(R.string.shortcut_start_session_short) + } val longLabel = - if (lastUsedGym != null) { - "Start a new climbing session at ${lastUsedGym.name}" - } else { - context.getString(R.string.shortcut_start_session_long) - } + if (lastUsedGym != null) { + "Start a new climbing session at ${lastUsedGym.name}" + } else { + context.getString(R.string.shortcut_start_session_long) + } return ShortcutInfo.Builder(context, SHORTCUT_START_SESSION) - .setShortLabel(shortLabel) - .setLongLabel(longLabel) - .setIcon(Icon.createWithResource(context, R.drawable.ic_play_arrow_24)) - .setIntent(startIntent) - .build() + .setShortLabel(shortLabel) + .setLongLabel(longLabel) + .setIcon(Icon.createWithResource(context, R.drawable.ic_play_arrow_24)) + .setIntent(startIntent) + .build() } @RequiresApi(Build.VERSION_CODES.N_MR1) private fun createEndSessionShortcut(context: Context): ShortcutInfo { val endIntent = - Intent(context, MainActivity::class.java).apply { - action = ACTION_END_SESSION - flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP - } + Intent(context, MainActivity::class.java).apply { + action = ACTION_END_SESSION + flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP + } return ShortcutInfo.Builder(context, SHORTCUT_END_SESSION) - .setShortLabel(context.getString(R.string.shortcut_end_session_short)) - .setLongLabel(context.getString(R.string.shortcut_end_session_long)) - .setIcon(Icon.createWithResource(context, R.drawable.ic_stop_24)) - .setIntent(endIntent) - .build() + .setShortLabel(context.getString(R.string.shortcut_end_session_short)) + .setLongLabel(context.getString(R.string.shortcut_end_session_long)) + .setIcon(Icon.createWithResource(context, R.drawable.ic_stop_24)) + .setIntent(endIntent) + .build() } /** Removes all dynamic shortcuts */ diff --git a/android/app/src/main/java/com/atridad/ascently/utils/ZipExportImportUtils.kt b/android/app/src/main/java/com/atridad/ascently/utils/ZipExportImportUtils.kt index 3a4d7a6..7e631d9 100644 --- a/android/app/src/main/java/com/atridad/ascently/utils/ZipExportImportUtils.kt +++ b/android/app/src/main/java/com/atridad/ascently/utils/ZipExportImportUtils.kt @@ -3,6 +3,8 @@ package com.atridad.ascently.utils import android.content.Context import com.atridad.ascently.data.format.BackupProblem import com.atridad.ascently.data.format.ClimbDataBackup +import kotlinx.serialization.encodeToString +import kotlinx.serialization.json.Json import java.io.File import java.io.FileInputStream import java.io.FileOutputStream @@ -11,8 +13,6 @@ import java.time.LocalDateTime import java.util.zip.ZipEntry import java.util.zip.ZipInputStream import java.util.zip.ZipOutputStream -import kotlinx.serialization.encodeToString -import kotlinx.serialization.json.Json object ZipExportImportUtils { @@ -25,15 +25,15 @@ object ZipExportImportUtils { context: Context, exportData: ClimbDataBackup, referencedImagePaths: Set, - directory: File? = null + directory: File? = null, ): File { val exportDir = directory ?: File( context.getExternalFilesDir( - android.os.Environment.DIRECTORY_DOCUMENTS + android.os.Environment.DIRECTORY_DOCUMENTS, ), - "Ascently" + "Ascently", ) if (!exportDir.exists()) { exportDir.mkdirs() @@ -92,7 +92,7 @@ object ZipExportImportUtils { // Log export summary AppLogger.i("ZipExportImportUtils") { - "Export completed: ${successfulImages}/${referencedImagePaths.size} images included" + "Export completed: $successfulImages/${referencedImagePaths.size} images included" } } @@ -116,7 +116,7 @@ object ZipExportImportUtils { context: Context, uri: android.net.Uri, exportData: ClimbDataBackup, - referencedImagePaths: Set + referencedImagePaths: Set, ) { try { context.contentResolver.openOutputStream(uri)?.use { outputStream -> @@ -164,7 +164,7 @@ object ZipExportImportUtils { } AppLogger.i("ZipExportImportUtils") { - "Export to URI completed: ${successfulImages}/${referencedImagePaths.size} images included" + "Export to URI completed: $successfulImages/${referencedImagePaths.size} images included" } } } @@ -176,7 +176,7 @@ object ZipExportImportUtils { private fun createMetadata( exportData: ClimbDataBackup, - referencedImagePaths: Set + referencedImagePaths: Set, ): String { return buildString { appendLine("Ascently Export Metadata") @@ -195,7 +195,7 @@ object ZipExportImportUtils { /** Data class to hold extraction results */ data class ImportResult( val jsonContent: String, - val importedImagePaths: Map // original filename -> new relative path + val importedImagePaths: Map, // original filename -> new relative path ) /** Extracts a ZIP file and returns the JSON content and imported image paths */ @@ -235,7 +235,7 @@ object ZipExportImportUtils { File.createTempFile( "import_image_", "_$originalFilename", - context.cacheDir + context.cacheDir, ) FileOutputStream(tempFile).use { output -> zipIn.copyTo(output) } @@ -306,7 +306,7 @@ object ZipExportImportUtils { */ fun updateProblemImagePaths( problems: List, - imagePathMapping: Map + imagePathMapping: Map, ): List { return problems.map { problem -> val updatedImagePaths = diff --git a/android/app/src/main/java/com/atridad/ascently/widget/ClimbStatsWidgetProvider.kt b/android/app/src/main/java/com/atridad/ascently/widget/ClimbStatsWidgetProvider.kt index 2db58c8..15e2709 100644 --- a/android/app/src/main/java/com/atridad/ascently/widget/ClimbStatsWidgetProvider.kt +++ b/android/app/src/main/java/com/atridad/ascently/widget/ClimbStatsWidgetProvider.kt @@ -11,12 +11,12 @@ import com.atridad.ascently.MainActivity import com.atridad.ascently.R import com.atridad.ascently.data.database.AscentlyDatabase import com.atridad.ascently.data.repository.ClimbRepository -import java.time.LocalDate import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.flow.first import kotlinx.coroutines.launch +import java.time.LocalDate class ClimbStatsWidgetProvider : AppWidgetProvider() { @@ -24,9 +24,9 @@ class ClimbStatsWidgetProvider : AppWidgetProvider() { private val coroutineScope = CoroutineScope(Dispatchers.IO + job) override fun onUpdate( - context: Context, - appWidgetManager: AppWidgetManager, - appWidgetIds: IntArray + context: Context, + appWidgetManager: AppWidgetManager, + appWidgetIds: IntArray, ) { for (appWidgetId in appWidgetIds) { updateAppWidget(context, appWidgetManager, appWidgetId) @@ -40,9 +40,9 @@ class ClimbStatsWidgetProvider : AppWidgetProvider() { } private fun updateAppWidget( - context: Context, - appWidgetManager: AppWidgetManager, - appWidgetId: Int + context: Context, + appWidgetManager: AppWidgetManager, + appWidgetId: Int, ) { coroutineScope.launch { try { @@ -59,20 +59,20 @@ class ClimbStatsWidgetProvider : AppWidgetProvider() { // Filter for last 7 days across all gyms val weekSessions = - sessions.filter { session -> - try { - val sessionDate = LocalDate.parse(session.date.substring(0, 10)) - !sessionDate.isBefore(sevenDaysAgo) && !sessionDate.isAfter(today) - } catch (_: Exception) { - false - } + sessions.filter { session -> + try { + val sessionDate = LocalDate.parse(session.date.substring(0, 10)) + !sessionDate.isBefore(sevenDaysAgo) && !sessionDate.isAfter(today) + } catch (_: Exception) { + false } + } val weekSessionIds = weekSessions.map { it.id }.toSet() // Count total attempts this week val totalAttempts = - attempts.count { attempt -> weekSessionIds.contains(attempt.sessionId) } + attempts.count { attempt -> weekSessionIds.contains(attempt.sessionId) } // Count sessions this week val totalSessions = weekSessions.size @@ -85,19 +85,19 @@ class ClimbStatsWidgetProvider : AppWidgetProvider() { views.setTextViewText(R.id.widget_sessions_value, totalSessions.toString()) val intent = - Intent(context, MainActivity::class.java).apply { - flags = - Intent.FLAG_ACTIVITY_NEW_TASK or - Intent.FLAG_ACTIVITY_CLEAR_TOP - } + Intent(context, MainActivity::class.java).apply { + flags = + Intent.FLAG_ACTIVITY_NEW_TASK or + Intent.FLAG_ACTIVITY_CLEAR_TOP + } val pendingIntent = - PendingIntent.getActivity( - context, - 0, - intent, - PendingIntent.FLAG_UPDATE_CURRENT or - PendingIntent.FLAG_IMMUTABLE - ) + PendingIntent.getActivity( + context, + 0, + intent, + PendingIntent.FLAG_UPDATE_CURRENT or + PendingIntent.FLAG_IMMUTABLE, + ) views.setOnClickPendingIntent(R.id.widget_container, pendingIntent) appWidgetManager.updateAppWidget(appWidgetId, views) @@ -110,13 +110,13 @@ class ClimbStatsWidgetProvider : AppWidgetProvider() { val intent = Intent(context, MainActivity::class.java) val pendingIntent = - PendingIntent.getActivity( - context, - 0, - intent, - PendingIntent.FLAG_UPDATE_CURRENT or - PendingIntent.FLAG_IMMUTABLE - ) + PendingIntent.getActivity( + context, + 0, + intent, + PendingIntent.FLAG_UPDATE_CURRENT or + PendingIntent.FLAG_IMMUTABLE, + ) views.setOnClickPendingIntent(R.id.widget_container, pendingIntent) appWidgetManager.updateAppWidget(appWidgetId, views) @@ -132,10 +132,10 @@ class ClimbStatsWidgetProvider : AppWidgetProvider() { val appWidgetIds = appWidgetManager.getAppWidgetIds(componentName) val intent = - Intent(context, ClimbStatsWidgetProvider::class.java).apply { - action = AppWidgetManager.ACTION_APPWIDGET_UPDATE - putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, appWidgetIds) - } + Intent(context, ClimbStatsWidgetProvider::class.java).apply { + action = AppWidgetManager.ACTION_APPWIDGET_UPDATE + putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, appWidgetIds) + } context.sendBroadcast(intent) } } diff --git a/android/app/src/test/java/com/atridad/openclimb/BusinessLogicTests.kt b/android/app/src/test/java/com/atridad/openclimb/BusinessLogicTests.kt index 120438e..6f91ebf 100644 --- a/android/app/src/test/java/com/atridad/openclimb/BusinessLogicTests.kt +++ b/android/app/src/test/java/com/atridad/openclimb/BusinessLogicTests.kt @@ -2,10 +2,10 @@ package com.atridad.ascently import com.atridad.ascently.data.format.* import com.atridad.ascently.data.model.* -import java.time.LocalDateTime -import java.time.format.DateTimeFormatter import org.junit.Assert.* import org.junit.Test +import java.time.LocalDateTime +import java.time.format.DateTimeFormatter class BusinessLogicTests { @@ -21,11 +21,11 @@ class BusinessLogicTests { assertNull(session.duration) val completedSession = - session.copy( - status = SessionStatus.COMPLETED, - endTime = getCurrentTimestamp(), - duration = 7200L - ) + session.copy( + status = SessionStatus.COMPLETED, + endTime = getCurrentTimestamp(), + duration = 7200L, + ) assertEquals(SessionStatus.COMPLETED, completedSession.status) assertNotNull(completedSession.endTime) assertNotNull(completedSession.duration) @@ -38,12 +38,12 @@ class BusinessLogicTests { val session = ClimbSession.create(gym.id) val attempt = - Attempt.create( - sessionId = session.id, - problemId = problem.id, - result = AttemptResult.SUCCESS, - notes = "Clean send!" - ) + Attempt.create( + sessionId = session.id, + problemId = problem.id, + result = AttemptResult.SUCCESS, + notes = "Clean send!", + ) assertEquals(session.id, attempt.sessionId) assertEquals(problem.id, attempt.problemId) @@ -76,12 +76,12 @@ class BusinessLogicTests { val problem2 = createTestProblem(gym.id) val attempts = - listOf( - Attempt.create(session.id, problem1.id, AttemptResult.SUCCESS), - Attempt.create(session.id, problem1.id, AttemptResult.FALL), - Attempt.create(session.id, problem2.id, AttemptResult.FLASH), - Attempt.create(session.id, problem2.id, AttemptResult.SUCCESS) - ) + listOf( + Attempt.create(session.id, problem1.id, AttemptResult.SUCCESS), + Attempt.create(session.id, problem1.id, AttemptResult.FALL), + Attempt.create(session.id, problem2.id, AttemptResult.FLASH), + Attempt.create(session.id, problem2.id, AttemptResult.SUCCESS), + ) val sessionStats = calculateSessionStatistics(session, attempts) @@ -97,17 +97,17 @@ class BusinessLogicTests { val session = ClimbSession.create(gym.id) val problems = - listOf( - createTestProblemWithGrade(gym.id, "V3"), - createTestProblemWithGrade(gym.id, "V4"), - createTestProblemWithGrade(gym.id, "V5"), - createTestProblemWithGrade(gym.id, "V6") - ) + listOf( + createTestProblemWithGrade(gym.id, "V3"), + createTestProblemWithGrade(gym.id, "V4"), + createTestProblemWithGrade(gym.id, "V5"), + createTestProblemWithGrade(gym.id, "V6"), + ) val attempts = - problems.map { problem -> - Attempt.create(session.id, problem.id, AttemptResult.SUCCESS) - } + problems.map { problem -> + Attempt.create(session.id, problem.id, AttemptResult.SUCCESS) + } val progression = calculateDifficultyProgression(attempts, problems) @@ -123,17 +123,17 @@ class BusinessLogicTests { val problems = listOf(createTestProblem(gym.id), createTestProblem(gym.id)) val session = ClimbSession.create(gym.id) val attempts = - problems.map { problem -> - Attempt.create(session.id, problem.id, AttemptResult.SUCCESS) - } + problems.map { problem -> + Attempt.create(session.id, problem.id, AttemptResult.SUCCESS) + } val backup = - createBackupData( - gyms = listOf(gym), - problems = problems, - sessions = listOf(session), - attempts = attempts - ) + createBackupData( + gyms = listOf(gym), + problems = problems, + sessions = listOf(session), + attempts = attempts, + ) validateBackupIntegrity(backup) @@ -146,30 +146,30 @@ class BusinessLogicTests { @Test fun testClimbTypeCompatibilityRules() { val boulderGym = - Gym( - id = "boulder_gym", - name = "Boulder Gym", - location = "Boulder City", - supportedClimbTypes = listOf(ClimbType.BOULDER), - difficultySystems = listOf(DifficultySystem.V_SCALE, DifficultySystem.FONT), - customDifficultyGrades = emptyList(), - notes = null, - createdAt = getCurrentTimestamp(), - updatedAt = getCurrentTimestamp() - ) + Gym( + id = "boulder_gym", + name = "Boulder Gym", + location = "Boulder City", + supportedClimbTypes = listOf(ClimbType.BOULDER), + difficultySystems = listOf(DifficultySystem.V_SCALE, DifficultySystem.FONT), + customDifficultyGrades = emptyList(), + notes = null, + createdAt = getCurrentTimestamp(), + updatedAt = getCurrentTimestamp(), + ) val ropeGym = - Gym( - id = "rope_gym", - name = "Rope Gym", - location = "Rope City", - supportedClimbTypes = listOf(ClimbType.ROPE), - difficultySystems = listOf(DifficultySystem.YDS), - customDifficultyGrades = emptyList(), - notes = null, - createdAt = getCurrentTimestamp(), - updatedAt = getCurrentTimestamp() - ) + Gym( + id = "rope_gym", + name = "Rope Gym", + location = "Rope City", + supportedClimbTypes = listOf(ClimbType.ROPE), + difficultySystems = listOf(DifficultySystem.YDS), + customDifficultyGrades = emptyList(), + notes = null, + createdAt = getCurrentTimestamp(), + updatedAt = getCurrentTimestamp(), + ) // Boulder gym should support boulder problems with V-Scale assertTrue(isCompatibleClimbType(boulderGym, ClimbType.BOULDER, DifficultySystem.V_SCALE)) @@ -197,26 +197,26 @@ class BusinessLogicTests { val session = ClimbSession.create(gym.id) val attempts = - listOf( - createAttemptWithTimestamp( - session.id, - problem.id, - "2024-01-01T10:00:00Z", - AttemptResult.FALL - ), - createAttemptWithTimestamp( - session.id, - problem.id, - "2024-01-01T10:05:00Z", - AttemptResult.FALL - ), - createAttemptWithTimestamp( - session.id, - problem.id, - "2024-01-01T10:10:00Z", - AttemptResult.SUCCESS - ) - ) + listOf( + createAttemptWithTimestamp( + session.id, + problem.id, + "2024-01-01T10:00:00Z", + AttemptResult.FALL, + ), + createAttemptWithTimestamp( + session.id, + problem.id, + "2024-01-01T10:05:00Z", + AttemptResult.FALL, + ), + createAttemptWithTimestamp( + session.id, + problem.id, + "2024-01-01T10:10:00Z", + AttemptResult.SUCCESS, + ), + ) val sequence = AttemptSequence(attempts) @@ -230,32 +230,32 @@ class BusinessLogicTests { @Test fun testGradeConsistencyValidation() { val validCombinations = - listOf( - Pair(ClimbType.BOULDER, DifficultySystem.V_SCALE), - Pair(ClimbType.BOULDER, DifficultySystem.FONT), - Pair(ClimbType.ROPE, DifficultySystem.YDS), - Pair(ClimbType.BOULDER, DifficultySystem.CUSTOM), - Pair(ClimbType.ROPE, DifficultySystem.CUSTOM) - ) + listOf( + Pair(ClimbType.BOULDER, DifficultySystem.V_SCALE), + Pair(ClimbType.BOULDER, DifficultySystem.FONT), + Pair(ClimbType.ROPE, DifficultySystem.YDS), + Pair(ClimbType.BOULDER, DifficultySystem.CUSTOM), + Pair(ClimbType.ROPE, DifficultySystem.CUSTOM), + ) val invalidCombinations = - listOf( - Pair(ClimbType.BOULDER, DifficultySystem.YDS), - Pair(ClimbType.ROPE, DifficultySystem.V_SCALE), - Pair(ClimbType.ROPE, DifficultySystem.FONT) - ) + listOf( + Pair(ClimbType.BOULDER, DifficultySystem.YDS), + Pair(ClimbType.ROPE, DifficultySystem.V_SCALE), + Pair(ClimbType.ROPE, DifficultySystem.FONT), + ) validCombinations.forEach { (climbType, difficultySystem) -> assertTrue( - "$climbType should be compatible with $difficultySystem", - isValidGradeCombination(climbType, difficultySystem) + "$climbType should be compatible with $difficultySystem", + isValidGradeCombination(climbType, difficultySystem), ) } invalidCombinations.forEach { (climbType, difficultySystem) -> assertFalse( - "$climbType should not be compatible with $difficultySystem", - isValidGradeCombination(climbType, difficultySystem) + "$climbType should not be compatible with $difficultySystem", + isValidGradeCombination(climbType, difficultySystem), ) } } @@ -276,11 +276,11 @@ class BusinessLogicTests { @Test fun testImagePathHandling() { val originalPaths = - listOf( - "/storage/images/problem1.jpg", - "/data/cache/problem2.png", - "relative/path/problem3.jpeg" - ) + listOf( + "/storage/images/problem1.jpg", + "/data/cache/problem2.png", + "relative/path/problem3.jpeg", + ) val relativePaths = convertToRelativePaths(originalPaths) @@ -295,76 +295,76 @@ class BusinessLogicTests { private fun createTestGym(): Gym { return Gym( - id = "test_gym_1", - name = "Test Climbing Gym", - location = "Test City", - supportedClimbTypes = listOf(ClimbType.BOULDER, ClimbType.ROPE), - difficultySystems = listOf(DifficultySystem.V_SCALE, DifficultySystem.YDS), - customDifficultyGrades = emptyList(), - notes = "Test gym for unit testing", - createdAt = getCurrentTimestamp(), - updatedAt = getCurrentTimestamp() + id = "test_gym_1", + name = "Test Climbing Gym", + location = "Test City", + supportedClimbTypes = listOf(ClimbType.BOULDER, ClimbType.ROPE), + difficultySystems = listOf(DifficultySystem.V_SCALE, DifficultySystem.YDS), + customDifficultyGrades = emptyList(), + notes = "Test gym for unit testing", + createdAt = getCurrentTimestamp(), + updatedAt = getCurrentTimestamp(), ) } private fun createTestProblem( - gymId: String, - climbType: ClimbType = ClimbType.BOULDER + gymId: String, + climbType: ClimbType = ClimbType.BOULDER, ): Problem { val difficulty = - when (climbType) { - ClimbType.BOULDER -> DifficultyGrade(DifficultySystem.V_SCALE, "V5") - ClimbType.ROPE -> DifficultyGrade(DifficultySystem.YDS, "5.10a") - } + when (climbType) { + ClimbType.BOULDER -> DifficultyGrade(DifficultySystem.V_SCALE, "V5") + ClimbType.ROPE -> DifficultyGrade(DifficultySystem.YDS, "5.10a") + } return Problem( - id = "test_problem_${java.util.UUID.randomUUID()}", - gymId = gymId, - name = "Test Problem", - description = "A test climbing problem", - climbType = climbType, - difficulty = difficulty, - tags = listOf("test", "overhang"), - location = "Wall A", - imagePaths = emptyList(), - isActive = true, - dateSet = "2024-01-01", - notes = null, - createdAt = getCurrentTimestamp(), - updatedAt = getCurrentTimestamp() + id = "test_problem_${java.util.UUID.randomUUID()}", + gymId = gymId, + name = "Test Problem", + description = "A test climbing problem", + climbType = climbType, + difficulty = difficulty, + tags = listOf("test", "overhang"), + location = "Wall A", + imagePaths = emptyList(), + isActive = true, + dateSet = "2024-01-01", + notes = null, + createdAt = getCurrentTimestamp(), + updatedAt = getCurrentTimestamp(), ) } private fun createTestProblemWithGrade(gymId: String, grade: String): Problem { return Problem( - id = "test_problem_${java.util.UUID.randomUUID()}", - gymId = gymId, - name = "Test Problem $grade", - description = null, - climbType = ClimbType.BOULDER, - difficulty = DifficultyGrade(DifficultySystem.V_SCALE, grade), - tags = emptyList(), - location = null, - imagePaths = emptyList(), - isActive = true, - dateSet = null, - notes = null, - createdAt = getCurrentTimestamp(), - updatedAt = getCurrentTimestamp() + id = "test_problem_${java.util.UUID.randomUUID()}", + gymId = gymId, + name = "Test Problem $grade", + description = null, + climbType = ClimbType.BOULDER, + difficulty = DifficultyGrade(DifficultySystem.V_SCALE, grade), + tags = emptyList(), + location = null, + imagePaths = emptyList(), + isActive = true, + dateSet = null, + notes = null, + createdAt = getCurrentTimestamp(), + updatedAt = getCurrentTimestamp(), ) } private fun createAttemptWithTimestamp( - sessionId: String, - problemId: String, - timestamp: String, - result: AttemptResult + sessionId: String, + problemId: String, + timestamp: String, + result: AttemptResult, ): Attempt { return Attempt.create( - sessionId = sessionId, - problemId = problemId, - result = result, - timestamp = timestamp + sessionId = sessionId, + problemId = problemId, + result = result, + timestamp = timestamp, ) } @@ -373,126 +373,126 @@ class BusinessLogicTests { } private fun calculateSessionStatistics( - session: ClimbSession, - attempts: List + session: ClimbSession, + attempts: List, ): SessionStatistics { val successful = - attempts.count { - it.result == AttemptResult.SUCCESS || it.result == AttemptResult.FLASH - } + attempts.count { + it.result == AttemptResult.SUCCESS || it.result == AttemptResult.FLASH + } val uniqueProblems = attempts.map { it.problemId }.toSet().size val successRate = (successful.toDouble() / attempts.size) * 100 return SessionStatistics( - totalAttempts = attempts.size, - successfulAttempts = successful, - uniqueProblems = uniqueProblems, - successRate = successRate + totalAttempts = attempts.size, + successfulAttempts = successful, + uniqueProblems = uniqueProblems, + successRate = successRate, ) } private fun calculateDifficultyProgression( - attempts: List, - problems: List + attempts: List, + problems: List, ): DifficultyProgression { val problemMap = problems.associateBy { it.id } val grades = - attempts - .mapNotNull { attempt -> problemMap[attempt.problemId]?.difficulty?.grade } - .filter { it.startsWith("V") } + attempts + .mapNotNull { attempt -> problemMap[attempt.problemId]?.difficulty?.grade } + .filter { it.startsWith("V") } val numericGrades = - grades.mapNotNull { grade -> - when (grade) { - "VB" -> 0 - else -> grade.removePrefix("V").toIntOrNull() - } + grades.mapNotNull { grade -> + when (grade) { + "VB" -> 0 + else -> grade.removePrefix("V").toIntOrNull() } + } val minGrade = "V${numericGrades.minOrNull() ?: 0}".replace("V0", "VB") val maxGrade = "V${numericGrades.maxOrNull() ?: 0}".replace("V0", "VB") val avgGrade = numericGrades.average() val showsProgression = - numericGrades.size > 1 && - (numericGrades.maxOrNull() ?: 0) > (numericGrades.minOrNull() ?: 0) + numericGrades.size > 1 && + (numericGrades.maxOrNull() ?: 0) > (numericGrades.minOrNull() ?: 0) return DifficultyProgression(minGrade, maxGrade, avgGrade, showsProgression) } private fun createBackupData( - gyms: List, - problems: List, - sessions: List, - attempts: List + gyms: List, + problems: List, + sessions: List, + attempts: List, ): ClimbDataBackup { return ClimbDataBackup( - exportedAt = getCurrentTimestamp(), - version = "2.0", - formatVersion = "2.0", - gyms = - gyms.map { gym -> - BackupGym( - id = gym.id, - name = gym.name, - location = gym.location, - supportedClimbTypes = gym.supportedClimbTypes, - difficultySystems = gym.difficultySystems, - customDifficultyGrades = gym.customDifficultyGrades, - notes = gym.notes, - createdAt = gym.createdAt, - updatedAt = gym.updatedAt - ) - }, - problems = - problems.map { problem -> - BackupProblem( - id = problem.id, - gymId = problem.gymId, - name = problem.name, - description = problem.description, - climbType = problem.climbType, - difficulty = problem.difficulty, - tags = problem.tags, - location = problem.location, - imagePaths = problem.imagePaths, - isActive = problem.isActive, - dateSet = problem.dateSet, - notes = problem.notes, - createdAt = problem.createdAt, - updatedAt = problem.updatedAt - ) - }, - sessions = - sessions.map { session -> - BackupClimbSession( - id = session.id, - gymId = session.gymId, - date = session.date, - startTime = session.startTime, - endTime = session.endTime, - duration = session.duration, - status = session.status, - notes = session.notes, - createdAt = session.createdAt, - updatedAt = session.updatedAt - ) - }, - attempts = - attempts.map { attempt -> - BackupAttempt( - id = attempt.id, - sessionId = attempt.sessionId, - problemId = attempt.problemId, - result = attempt.result, - highestHold = attempt.highestHold, - notes = attempt.notes, - duration = attempt.duration, - restTime = attempt.restTime, - timestamp = attempt.timestamp, - createdAt = attempt.createdAt, - updatedAt = attempt.updatedAt, - ) - } + exportedAt = getCurrentTimestamp(), + version = "2.0", + formatVersion = "2.0", + gyms = + gyms.map { gym -> + BackupGym( + id = gym.id, + name = gym.name, + location = gym.location, + supportedClimbTypes = gym.supportedClimbTypes, + difficultySystems = gym.difficultySystems, + customDifficultyGrades = gym.customDifficultyGrades, + notes = gym.notes, + createdAt = gym.createdAt, + updatedAt = gym.updatedAt, + ) + }, + problems = + problems.map { problem -> + BackupProblem( + id = problem.id, + gymId = problem.gymId, + name = problem.name, + description = problem.description, + climbType = problem.climbType, + difficulty = problem.difficulty, + tags = problem.tags, + location = problem.location, + imagePaths = problem.imagePaths, + isActive = problem.isActive, + dateSet = problem.dateSet, + notes = problem.notes, + createdAt = problem.createdAt, + updatedAt = problem.updatedAt, + ) + }, + sessions = + sessions.map { session -> + BackupClimbSession( + id = session.id, + gymId = session.gymId, + date = session.date, + startTime = session.startTime, + endTime = session.endTime, + duration = session.duration, + status = session.status, + notes = session.notes, + createdAt = session.createdAt, + updatedAt = session.updatedAt, + ) + }, + attempts = + attempts.map { attempt -> + BackupAttempt( + id = attempt.id, + sessionId = attempt.sessionId, + problemId = attempt.problemId, + result = attempt.result, + highestHold = attempt.highestHold, + notes = attempt.notes, + duration = attempt.duration, + restTime = attempt.restTime, + timestamp = attempt.timestamp, + createdAt = attempt.createdAt, + updatedAt = attempt.updatedAt, + ) + }, ) } @@ -501,8 +501,8 @@ class BusinessLogicTests { val gymIds = backup.gyms.map { it.id }.toSet() backup.problems.forEach { problem -> assertTrue( - "Problem ${problem.id} references non-existent gym ${problem.gymId}", - gymIds.contains(problem.gymId) + "Problem ${problem.id} references non-existent gym ${problem.gymId}", + gymIds.contains(problem.gymId), ) } @@ -510,8 +510,8 @@ class BusinessLogicTests { val sessionIds = backup.sessions.map { it.id }.toSet() backup.attempts.forEach { attempt -> assertTrue( - "Attempt ${attempt.id} references non-existent session ${attempt.sessionId}", - sessionIds.contains(attempt.sessionId) + "Attempt ${attempt.id} references non-existent session ${attempt.sessionId}", + sessionIds.contains(attempt.sessionId), ) } @@ -519,19 +519,19 @@ class BusinessLogicTests { val problemIds = backup.problems.map { it.id }.toSet() backup.attempts.forEach { attempt -> assertTrue( - "Attempt ${attempt.id} references non-existent problem ${attempt.problemId}", - problemIds.contains(attempt.problemId) + "Attempt ${attempt.id} references non-existent problem ${attempt.problemId}", + problemIds.contains(attempt.problemId), ) } } private fun isCompatibleClimbType( - gym: Gym, - climbType: ClimbType, - difficultySystem: DifficultySystem + gym: Gym, + climbType: ClimbType, + difficultySystem: DifficultySystem, ): Boolean { return gym.supportedClimbTypes.contains(climbType) && - gym.difficultySystems.contains(difficultySystem) + gym.difficultySystems.contains(difficultySystem) } private fun calculateSessionDuration(startTime: String, endTime: String): Long { @@ -541,19 +541,19 @@ class BusinessLogicTests { } private fun isValidGradeCombination( - climbType: ClimbType, - difficultySystem: DifficultySystem + climbType: ClimbType, + difficultySystem: DifficultySystem, ): Boolean { return when (climbType) { ClimbType.BOULDER -> - difficultySystem in - listOf( - DifficultySystem.V_SCALE, - DifficultySystem.FONT, - DifficultySystem.CUSTOM - ) + difficultySystem in + listOf( + DifficultySystem.V_SCALE, + DifficultySystem.FONT, + DifficultySystem.CUSTOM, + ) ClimbType.ROPE -> - difficultySystem in listOf(DifficultySystem.YDS, DifficultySystem.CUSTOM) + difficultySystem in listOf(DifficultySystem.YDS, DifficultySystem.CUSTOM) } } @@ -568,29 +568,29 @@ class BusinessLogicTests { // Data classes for testing data class SessionStatistics( - val totalAttempts: Int, - val successfulAttempts: Int, - val uniqueProblems: Int, - val successRate: Double + val totalAttempts: Int, + val successfulAttempts: Int, + val uniqueProblems: Int, + val successRate: Double, ) data class DifficultyProgression( - val minGrade: String, - val maxGrade: String, - val averageGrade: Double, - val showsProgression: Boolean + val minGrade: String, + val maxGrade: String, + val averageGrade: Double, + val showsProgression: Boolean, ) data class AttemptSequence(val attempts: List) { val totalAttempts = attempts.size val failedAttempts = - attempts.count { - it.result == AttemptResult.FALL || it.result == AttemptResult.NO_PROGRESS - } + attempts.count { + it.result == AttemptResult.FALL || it.result == AttemptResult.NO_PROGRESS + } val successfulAttempts = - attempts.count { - it.result == AttemptResult.SUCCESS || it.result == AttemptResult.FLASH - } + attempts.count { + it.result == AttemptResult.SUCCESS || it.result == AttemptResult.FLASH + } val finalResult = attempts.lastOrNull()?.result fun isValidSequence(): Boolean { diff --git a/android/app/src/test/java/com/atridad/openclimb/DataModelTests.kt b/android/app/src/test/java/com/atridad/openclimb/DataModelTests.kt index 8286423..8b19c07 100644 --- a/android/app/src/test/java/com/atridad/openclimb/DataModelTests.kt +++ b/android/app/src/test/java/com/atridad/openclimb/DataModelTests.kt @@ -2,10 +2,10 @@ package com.atridad.ascently import com.atridad.ascently.data.format.* import com.atridad.ascently.data.model.* -import java.time.Instant -import java.time.format.DateTimeFormatter import org.junit.Assert.* import org.junit.Test +import java.time.Instant +import java.time.format.DateTimeFormatter class DataModelTests { @@ -141,17 +141,17 @@ class DataModelTests { @Test fun testBackupGymCreationAndValidation() { val gym = - BackupGym( - id = "gym123", - name = "Test Climbing Gym", - location = "Test City", - supportedClimbTypes = listOf(ClimbType.BOULDER, ClimbType.ROPE), - difficultySystems = listOf(DifficultySystem.V_SCALE, DifficultySystem.YDS), - customDifficultyGrades = emptyList(), - notes = "Great gym for beginners", - createdAt = "2024-01-01T10:00:00Z", - updatedAt = "2024-01-01T10:00:00Z" - ) + BackupGym( + id = "gym123", + name = "Test Climbing Gym", + location = "Test City", + supportedClimbTypes = listOf(ClimbType.BOULDER, ClimbType.ROPE), + difficultySystems = listOf(DifficultySystem.V_SCALE, DifficultySystem.YDS), + customDifficultyGrades = emptyList(), + notes = "Great gym for beginners", + createdAt = "2024-01-01T10:00:00Z", + updatedAt = "2024-01-01T10:00:00Z", + ) assertEquals("gym123", gym.id) assertEquals("Test Climbing Gym", gym.name) @@ -167,22 +167,22 @@ class DataModelTests { @Test fun testBackupProblemCreationAndValidation() { val problem = - BackupProblem( - id = "problem123", - gymId = "gym123", - name = "Test Problem", - description = "A challenging boulder problem", - climbType = ClimbType.BOULDER, - difficulty = DifficultyGrade(DifficultySystem.V_SCALE, "V5"), - tags = listOf("overhang", "crimpy"), - location = "Wall A", - imagePaths = listOf("image1.jpg", "image2.jpg"), - isActive = true, - dateSet = "2024-01-01", - notes = "Watch the start holds", - createdAt = "2024-01-01T10:00:00Z", - updatedAt = "2024-01-01T10:00:00Z" - ) + BackupProblem( + id = "problem123", + gymId = "gym123", + name = "Test Problem", + description = "A challenging boulder problem", + climbType = ClimbType.BOULDER, + difficulty = DifficultyGrade(DifficultySystem.V_SCALE, "V5"), + tags = listOf("overhang", "crimpy"), + location = "Wall A", + imagePaths = listOf("image1.jpg", "image2.jpg"), + isActive = true, + dateSet = "2024-01-01", + notes = "Watch the start holds", + createdAt = "2024-01-01T10:00:00Z", + updatedAt = "2024-01-01T10:00:00Z", + ) assertEquals("problem123", problem.id) assertEquals("gym123", problem.gymId) @@ -190,25 +190,25 @@ class DataModelTests { assertEquals(ClimbType.BOULDER, problem.climbType) assertEquals("V5", problem.difficulty.grade) assertTrue(problem.isActive) - assertEquals(2, problem.tags.size) + assertEquals(2, problem.tags?.size ?: 0) assertEquals(2, problem.imagePaths?.size ?: 0) } @Test fun testBackupClimbSessionCreationAndValidation() { val session = - BackupClimbSession( - id = "session123", - gymId = "gym123", - date = "2024-01-01", - startTime = "2024-01-01T10:00:00Z", - endTime = "2024-01-01T12:00:00Z", - duration = 7200, - status = SessionStatus.COMPLETED, - notes = "Great session today", - createdAt = "2024-01-01T10:00:00Z", - updatedAt = "2024-01-01T12:00:00Z" - ) + BackupClimbSession( + id = "session123", + gymId = "gym123", + date = "2024-01-01", + startTime = "2024-01-01T10:00:00Z", + endTime = "2024-01-01T12:00:00Z", + duration = 7200, + status = SessionStatus.COMPLETED, + notes = "Great session today", + createdAt = "2024-01-01T10:00:00Z", + updatedAt = "2024-01-01T12:00:00Z", + ) assertEquals("session123", session.id) assertEquals("gym123", session.gymId) @@ -220,19 +220,19 @@ class DataModelTests { @Test fun testBackupAttemptCreationAndValidation() { val attempt = - BackupAttempt( - id = "attempt123", - sessionId = "session123", - problemId = "problem123", - result = AttemptResult.SUCCESS, - highestHold = "Top", - notes = "Stuck it on second try", - duration = 300, - restTime = 120, - timestamp = "2024-01-01T10:30:00Z", - createdAt = "2024-01-01T10:30:00Z", - updatedAt = "2024-01-01T10:30:00Z" - ) + BackupAttempt( + id = "attempt123", + sessionId = "session123", + problemId = "problem123", + result = AttemptResult.SUCCESS, + highestHold = "Top", + notes = "Stuck it on second try", + duration = 300, + restTime = 120, + timestamp = "2024-01-01T10:30:00Z", + createdAt = "2024-01-01T10:30:00Z", + updatedAt = "2024-01-01T10:30:00Z", + ) assertEquals("attempt123", attempt.id) assertEquals("session123", attempt.sessionId) @@ -246,15 +246,15 @@ class DataModelTests { @Test fun testClimbDataBackupCreationAndValidation() { val backup = - ClimbDataBackup( - exportedAt = "2024-01-01T10:00:00Z", - version = "2.0", - formatVersion = "2.0", - gyms = emptyList(), - problems = emptyList(), - sessions = emptyList(), - attempts = emptyList() - ) + ClimbDataBackup( + exportedAt = "2024-01-01T10:00:00Z", + version = "2.0", + formatVersion = "2.0", + gyms = emptyList(), + problems = emptyList(), + sessions = emptyList(), + attempts = emptyList(), + ) assertEquals("2.0", backup.version) assertEquals("2.0", backup.formatVersion) @@ -280,18 +280,18 @@ class DataModelTests { @Test fun testSessionDurationCalculation() { val session = - BackupClimbSession( - id = "test", - gymId = "gym1", - date = "2024-01-01", - startTime = "2024-01-01T10:00:00Z", - endTime = "2024-01-01T12:00:00Z", - duration = 7200, - status = SessionStatus.COMPLETED, - notes = null, - createdAt = "2024-01-01T10:00:00Z", - updatedAt = "2024-01-01T12:00:00Z" - ) + BackupClimbSession( + id = "test", + gymId = "gym1", + date = "2024-01-01", + startTime = "2024-01-01T10:00:00Z", + endTime = "2024-01-01T12:00:00Z", + duration = 7200, + status = SessionStatus.COMPLETED, + notes = null, + createdAt = "2024-01-01T10:00:00Z", + updatedAt = "2024-01-01T12:00:00Z", + ) assertEquals(7200L, session.duration) val hours = session.duration!! / 3600 @@ -301,21 +301,21 @@ class DataModelTests { @Test fun testEmptyCollectionsHandling() { val gym = - BackupGym( - id = "gym1", - name = "Test Gym", - location = null, - supportedClimbTypes = emptyList(), - difficultySystems = emptyList(), - customDifficultyGrades = emptyList(), - notes = null, - createdAt = "2024-01-01T10:00:00Z", - updatedAt = "2024-01-01T10:00:00Z" - ) + BackupGym( + id = "gym1", + name = "Test Gym", + location = null, + supportedClimbTypes = emptyList(), + difficultySystems = emptyList(), + customDifficultyGrades = emptyList(), + notes = null, + createdAt = "2024-01-01T10:00:00Z", + updatedAt = "2024-01-01T10:00:00Z", + ) - assertTrue(gym.supportedClimbTypes.isEmpty()) - assertTrue(gym.difficultySystems.isEmpty()) - assertTrue(gym.customDifficultyGrades.isEmpty()) + assertTrue(gym.supportedClimbTypes?.isEmpty() ?: true) + assertTrue(gym.difficultySystems?.isEmpty() ?: true) + assertTrue(gym.customDifficultyGrades?.isEmpty() ?: true) assertNull(gym.location) assertNull(gym.notes) } @@ -323,29 +323,29 @@ class DataModelTests { @Test fun testNullableFieldsHandling() { val problem = - BackupProblem( - id = "problem1", - gymId = "gym1", - name = null, - description = null, - climbType = ClimbType.BOULDER, - difficulty = DifficultyGrade(DifficultySystem.V_SCALE, "V1"), - tags = emptyList(), - location = null, - imagePaths = null, - isActive = true, - dateSet = null, - notes = null, - createdAt = "2024-01-01T10:00:00Z", - updatedAt = "2024-01-01T10:00:00Z" - ) + BackupProblem( + id = "problem1", + gymId = "gym1", + name = null, + description = null, + climbType = ClimbType.BOULDER, + difficulty = DifficultyGrade(DifficultySystem.V_SCALE, "V1"), + tags = emptyList(), + location = null, + imagePaths = null, + isActive = true, + dateSet = null, + notes = null, + createdAt = "2024-01-01T10:00:00Z", + updatedAt = "2024-01-01T10:00:00Z", + ) assertNull(problem.name) assertNull(problem.description) assertNull(problem.location) assertNull(problem.dateSet) assertNull(problem.notes) - assertTrue(problem.tags.isEmpty()) + assertTrue(problem.tags?.isEmpty() ?: true) assertNull(problem.imagePaths) } @@ -362,7 +362,7 @@ class DataModelTests { @Test fun testBackupDataFormatValidation() { val testJson = - """ + """ { "exportedAt": "2024-01-01T10:00:00Z", "version": "2.0", @@ -372,7 +372,7 @@ class DataModelTests { "sessions": [], "attempts": [] } - """.trimIndent() + """.trimIndent() assertTrue(testJson.contains("exportedAt")) assertTrue(testJson.contains("version")) @@ -397,44 +397,44 @@ class DataModelTests { fun testClimbTypeAndDifficultySystemCompatibility() { // Test that V_SCALE works with BOULDER val boulderProblem = - BackupProblem( - id = "boulder1", - gymId = "gym1", - name = "Boulder Problem", - description = null, - climbType = ClimbType.BOULDER, - difficulty = DifficultyGrade(DifficultySystem.V_SCALE, "V3"), - tags = emptyList(), - location = null, - imagePaths = null, - isActive = true, - dateSet = null, - notes = null, - createdAt = "2024-01-01T10:00:00Z", - updatedAt = "2024-01-01T10:00:00Z" - ) + BackupProblem( + id = "boulder1", + gymId = "gym1", + name = "Boulder Problem", + description = null, + climbType = ClimbType.BOULDER, + difficulty = DifficultyGrade(DifficultySystem.V_SCALE, "V3"), + tags = emptyList(), + location = null, + imagePaths = null, + isActive = true, + dateSet = null, + notes = null, + createdAt = "2024-01-01T10:00:00Z", + updatedAt = "2024-01-01T10:00:00Z", + ) assertEquals(ClimbType.BOULDER, boulderProblem.climbType) assertEquals(DifficultySystem.V_SCALE, boulderProblem.difficulty.system) // Test that YDS works with ROPE val ropeProblem = - BackupProblem( - id = "rope1", - gymId = "gym1", - name = "Rope Problem", - description = null, - climbType = ClimbType.ROPE, - difficulty = DifficultyGrade(DifficultySystem.YDS, "5.10a"), - tags = emptyList(), - location = null, - imagePaths = null, - isActive = true, - dateSet = null, - notes = null, - createdAt = "2024-01-01T10:00:00Z", - updatedAt = "2024-01-01T10:00:00Z" - ) + BackupProblem( + id = "rope1", + gymId = "gym1", + name = "Rope Problem", + description = null, + climbType = ClimbType.ROPE, + difficulty = DifficultyGrade(DifficultySystem.YDS, "5.10a"), + tags = emptyList(), + location = null, + imagePaths = null, + isActive = true, + dateSet = null, + notes = null, + createdAt = "2024-01-01T10:00:00Z", + updatedAt = "2024-01-01T10:00:00Z", + ) assertEquals(ClimbType.ROPE, ropeProblem.climbType) assertEquals(DifficultySystem.YDS, ropeProblem.difficulty.system) @@ -473,12 +473,12 @@ class DataModelTests { @Test fun testAttemptResultValidation() { val validResults = - listOf( - AttemptResult.SUCCESS, - AttemptResult.FALL, - AttemptResult.NO_PROGRESS, - AttemptResult.FLASH - ) + listOf( + AttemptResult.SUCCESS, + AttemptResult.FALL, + AttemptResult.NO_PROGRESS, + AttemptResult.FLASH, + ) assertEquals(4, validResults.size) assertTrue(validResults.contains(AttemptResult.SUCCESS)) @@ -490,7 +490,7 @@ class DataModelTests { @Test fun testSessionStatusValidation() { val validStatuses = - listOf(SessionStatus.ACTIVE, SessionStatus.COMPLETED, SessionStatus.PAUSED) + listOf(SessionStatus.ACTIVE, SessionStatus.COMPLETED, SessionStatus.PAUSED) assertEquals(3, validStatuses.size) assertTrue(validStatuses.contains(SessionStatus.ACTIVE)) @@ -501,64 +501,64 @@ class DataModelTests { @Test fun testClimbDataIntegrity() { val gym = - BackupGym( - id = "gym1", - name = "Test Gym", - location = "Test City", - supportedClimbTypes = listOf(ClimbType.BOULDER), - difficultySystems = listOf(DifficultySystem.V_SCALE), - customDifficultyGrades = emptyList(), - notes = null, - createdAt = "2024-01-01T10:00:00Z", - updatedAt = "2024-01-01T10:00:00Z" - ) + BackupGym( + id = "gym1", + name = "Test Gym", + location = "Test City", + supportedClimbTypes = listOf(ClimbType.BOULDER), + difficultySystems = listOf(DifficultySystem.V_SCALE), + customDifficultyGrades = emptyList(), + notes = null, + createdAt = "2024-01-01T10:00:00Z", + updatedAt = "2024-01-01T10:00:00Z", + ) val problem = - BackupProblem( - id = "problem1", - gymId = gym.id, - name = "Test Problem", - description = null, - climbType = ClimbType.BOULDER, - difficulty = DifficultyGrade(DifficultySystem.V_SCALE, "V3"), - tags = emptyList(), - location = null, - imagePaths = null, - isActive = true, - dateSet = null, - notes = null, - createdAt = "2024-01-01T10:00:00Z", - updatedAt = "2024-01-01T10:00:00Z" - ) + BackupProblem( + id = "problem1", + gymId = gym.id, + name = "Test Problem", + description = null, + climbType = ClimbType.BOULDER, + difficulty = DifficultyGrade(DifficultySystem.V_SCALE, "V3"), + tags = emptyList(), + location = null, + imagePaths = null, + isActive = true, + dateSet = null, + notes = null, + createdAt = "2024-01-01T10:00:00Z", + updatedAt = "2024-01-01T10:00:00Z", + ) val session = - BackupClimbSession( - id = "session1", - gymId = gym.id, - date = "2024-01-01", - startTime = "2024-01-01T10:00:00Z", - endTime = "2024-01-01T11:00:00Z", - duration = 3600, - status = SessionStatus.COMPLETED, - notes = null, - createdAt = "2024-01-01T10:00:00Z", - updatedAt = "2024-01-01T11:00:00Z" - ) + BackupClimbSession( + id = "session1", + gymId = gym.id, + date = "2024-01-01", + startTime = "2024-01-01T10:00:00Z", + endTime = "2024-01-01T11:00:00Z", + duration = 3600, + status = SessionStatus.COMPLETED, + notes = null, + createdAt = "2024-01-01T10:00:00Z", + updatedAt = "2024-01-01T11:00:00Z", + ) val attempt = - BackupAttempt( - id = "attempt1", - sessionId = session.id, - problemId = problem.id, - result = AttemptResult.SUCCESS, - highestHold = null, - notes = null, - duration = 120, - restTime = null, - timestamp = "2024-01-01T10:30:00Z", - createdAt = "2024-01-01T10:30:00Z", - updatedAt = "2024-01-01T10:30:00Z" - ) + BackupAttempt( + id = "attempt1", + sessionId = session.id, + problemId = problem.id, + result = AttemptResult.SUCCESS, + highestHold = null, + notes = null, + duration = 120, + restTime = null, + timestamp = "2024-01-01T10:30:00Z", + createdAt = "2024-01-01T10:30:00Z", + updatedAt = "2024-01-01T10:30:00Z", + ) // Verify referential integrity assertEquals(gym.id, problem.gymId) diff --git a/android/app/src/test/java/com/atridad/openclimb/SyncMergeLogicTest.kt b/android/app/src/test/java/com/atridad/openclimb/SyncMergeLogicTest.kt index 43d3f2b..9e5ef8c 100644 --- a/android/app/src/test/java/com/atridad/openclimb/SyncMergeLogicTest.kt +++ b/android/app/src/test/java/com/atridad/openclimb/SyncMergeLogicTest.kt @@ -11,197 +11,197 @@ class SyncMergeLogicTest { fun `test intelligent merge preserves all data`() { // Create local data val localGyms = - listOf( - BackupGym( - id = "gym1", - name = "Local Gym 1", - location = "Local Location", - supportedClimbTypes = listOf(ClimbType.BOULDER), - difficultySystems = listOf(DifficultySystem.V_SCALE), - customDifficultyGrades = emptyList(), - notes = null, - createdAt = "2024-01-01T10:00:00", - updatedAt = "2024-01-01T10:00:00" - ) - ) + listOf( + BackupGym( + id = "gym1", + name = "Local Gym 1", + location = "Local Location", + supportedClimbTypes = listOf(ClimbType.BOULDER), + difficultySystems = listOf(DifficultySystem.V_SCALE), + customDifficultyGrades = emptyList(), + notes = null, + createdAt = "2024-01-01T10:00:00", + updatedAt = "2024-01-01T10:00:00", + ), + ) val localProblems = - listOf( - BackupProblem( - id = "problem1", - gymId = "gym1", - name = "Local Problem", - description = "Local description", - climbType = ClimbType.BOULDER, - difficulty = DifficultyGrade(DifficultySystem.V_SCALE, "V5"), - tags = listOf("local"), - location = null, - imagePaths = listOf("local_image.jpg"), - isActive = true, - dateSet = null, - notes = null, - createdAt = "2024-01-01T10:00:00", - updatedAt = "2024-01-01T10:00:00" - ) - ) + listOf( + BackupProblem( + id = "problem1", + gymId = "gym1", + name = "Local Problem", + description = "Local description", + climbType = ClimbType.BOULDER, + difficulty = DifficultyGrade(DifficultySystem.V_SCALE, "V5"), + tags = listOf("local"), + location = null, + imagePaths = listOf("local_image.jpg"), + isActive = true, + dateSet = null, + notes = null, + createdAt = "2024-01-01T10:00:00", + updatedAt = "2024-01-01T10:00:00", + ), + ) val localSessions = - listOf( - BackupClimbSession( - id = "session1", - gymId = "gym1", - date = "2024-01-01", - startTime = "2024-01-01T10:00:00", - endTime = "2024-01-01T12:00:00", - duration = 7200, - status = SessionStatus.COMPLETED, - notes = null, - createdAt = "2024-01-01T10:00:00", - updatedAt = "2024-01-01T10:00:00" - ) - ) + listOf( + BackupClimbSession( + id = "session1", + gymId = "gym1", + date = "2024-01-01", + startTime = "2024-01-01T10:00:00", + endTime = "2024-01-01T12:00:00", + duration = 7200, + status = SessionStatus.COMPLETED, + notes = null, + createdAt = "2024-01-01T10:00:00", + updatedAt = "2024-01-01T10:00:00", + ), + ) val localAttempts = - listOf( - BackupAttempt( - id = "attempt1", - sessionId = "session1", - problemId = "problem1", - result = AttemptResult.SUCCESS, - highestHold = null, - notes = null, - duration = 300, - restTime = null, - timestamp = "2024-01-01T10:30:00", - createdAt = "2024-01-01T10:30:00", - updatedAt = "2024-01-01T10:30:00" - ) - ) + listOf( + BackupAttempt( + id = "attempt1", + sessionId = "session1", + problemId = "problem1", + result = AttemptResult.SUCCESS, + highestHold = null, + notes = null, + duration = 300, + restTime = null, + timestamp = "2024-01-01T10:30:00", + createdAt = "2024-01-01T10:30:00", + updatedAt = "2024-01-01T10:30:00", + ), + ) val localBackup = - ClimbDataBackup( - exportedAt = "2024-01-01T10:00:00", - version = "2.0", - formatVersion = "2.0", - gyms = localGyms, - problems = localProblems, - sessions = localSessions, - attempts = localAttempts - ) + ClimbDataBackup( + exportedAt = "2024-01-01T10:00:00", + version = "2.0", + formatVersion = "2.0", + gyms = localGyms, + problems = localProblems, + sessions = localSessions, + attempts = localAttempts, + ) // Create server data with some overlapping and some unique data val serverGyms = - listOf( - // Same gym but with newer update - BackupGym( - id = "gym1", - name = "Updated Gym 1", - location = "Updated Location", - supportedClimbTypes = listOf(ClimbType.BOULDER, ClimbType.ROPE), - difficultySystems = - listOf(DifficultySystem.V_SCALE, DifficultySystem.YDS), - customDifficultyGrades = emptyList(), - notes = "Updated notes", - createdAt = "2024-01-01T10:00:00", - updatedAt = "2024-01-01T12:00:00" // Newer update - ), - // Unique server gym - BackupGym( - id = "gym2", - name = "Server Gym 2", - location = "Server Location", - supportedClimbTypes = listOf(ClimbType.ROPE), - difficultySystems = listOf(DifficultySystem.YDS), - customDifficultyGrades = emptyList(), - notes = null, - createdAt = "2024-01-01T11:00:00", - updatedAt = "2024-01-01T11:00:00" - ) - ) + listOf( + // Same gym but with newer update + BackupGym( + id = "gym1", + name = "Updated Gym 1", + location = "Updated Location", + supportedClimbTypes = listOf(ClimbType.BOULDER, ClimbType.ROPE), + difficultySystems = + listOf(DifficultySystem.V_SCALE, DifficultySystem.YDS), + customDifficultyGrades = emptyList(), + notes = "Updated notes", + createdAt = "2024-01-01T10:00:00", + updatedAt = "2024-01-01T12:00:00", // Newer update + ), + // Unique server gym + BackupGym( + id = "gym2", + name = "Server Gym 2", + location = "Server Location", + supportedClimbTypes = listOf(ClimbType.ROPE), + difficultySystems = listOf(DifficultySystem.YDS), + customDifficultyGrades = emptyList(), + notes = null, + createdAt = "2024-01-01T11:00:00", + updatedAt = "2024-01-01T11:00:00", + ), + ) val serverProblems = - listOf( - // Same problem but with newer update and different images - BackupProblem( - id = "problem1", - gymId = "gym1", - name = "Updated Problem", - description = "Updated description", - climbType = ClimbType.BOULDER, - difficulty = DifficultyGrade(DifficultySystem.V_SCALE, "V5"), - tags = listOf("updated", "server"), - location = "Updated location", - imagePaths = listOf("server_image.jpg"), - isActive = true, - dateSet = "2024-01-01", - notes = "Updated notes", - createdAt = "2024-01-01T10:00:00", - updatedAt = "2024-01-01T11:00:00" // Newer update - ), - // Unique server problem - BackupProblem( - id = "problem2", - gymId = "gym2", - name = "Server Problem", - description = "Server description", - climbType = ClimbType.ROPE, - difficulty = DifficultyGrade(DifficultySystem.YDS, "5.10a"), - tags = listOf("server"), - location = null, - imagePaths = null, - isActive = true, - dateSet = null, - notes = null, - createdAt = "2024-01-01T11:00:00", - updatedAt = "2024-01-01T11:00:00" - ) - ) + listOf( + // Same problem but with newer update and different images + BackupProblem( + id = "problem1", + gymId = "gym1", + name = "Updated Problem", + description = "Updated description", + climbType = ClimbType.BOULDER, + difficulty = DifficultyGrade(DifficultySystem.V_SCALE, "V5"), + tags = listOf("updated", "server"), + location = "Updated location", + imagePaths = listOf("server_image.jpg"), + isActive = true, + dateSet = "2024-01-01", + notes = "Updated notes", + createdAt = "2024-01-01T10:00:00", + updatedAt = "2024-01-01T11:00:00", // Newer update + ), + // Unique server problem + BackupProblem( + id = "problem2", + gymId = "gym2", + name = "Server Problem", + description = "Server description", + climbType = ClimbType.ROPE, + difficulty = DifficultyGrade(DifficultySystem.YDS, "5.10a"), + tags = listOf("server"), + location = null, + imagePaths = null, + isActive = true, + dateSet = null, + notes = null, + createdAt = "2024-01-01T11:00:00", + updatedAt = "2024-01-01T11:00:00", + ), + ) val serverSessions = - listOf( - // Unique server session - BackupClimbSession( - id = "session2", - gymId = "gym2", - date = "2024-01-02", - startTime = "2024-01-02T14:00:00", - endTime = "2024-01-02T16:00:00", - duration = 7200, - status = SessionStatus.COMPLETED, - notes = "Server session", - createdAt = "2024-01-02T14:00:00", - updatedAt = "2024-01-02T14:00:00" - ) - ) + listOf( + // Unique server session + BackupClimbSession( + id = "session2", + gymId = "gym2", + date = "2024-01-02", + startTime = "2024-01-02T14:00:00", + endTime = "2024-01-02T16:00:00", + duration = 7200, + status = SessionStatus.COMPLETED, + notes = "Server session", + createdAt = "2024-01-02T14:00:00", + updatedAt = "2024-01-02T14:00:00", + ), + ) val serverAttempts = - listOf( - // Unique server attempt - BackupAttempt( - id = "attempt2", - sessionId = "session2", - problemId = "problem2", - result = AttemptResult.FALL, - highestHold = "Last move", - notes = "Almost had it", - duration = 180, - restTime = 60, - timestamp = "2024-01-02T14:30:00", - createdAt = "2024-01-02T14:30:00", - updatedAt = "2024-01-02T14:30:00" - ) - ) + listOf( + // Unique server attempt + BackupAttempt( + id = "attempt2", + sessionId = "session2", + problemId = "problem2", + result = AttemptResult.FALL, + highestHold = "Last move", + notes = "Almost had it", + duration = 180, + restTime = 60, + timestamp = "2024-01-02T14:30:00", + createdAt = "2024-01-02T14:30:00", + updatedAt = "2024-01-02T14:30:00", + ), + ) val serverBackup = - ClimbDataBackup( - exportedAt = "2024-01-01T12:00:00", - version = "2.0", - formatVersion = "2.0", - gyms = serverGyms, - problems = serverProblems, - sessions = serverSessions, - attempts = serverAttempts - ) + ClimbDataBackup( + exportedAt = "2024-01-01T12:00:00", + version = "2.0", + formatVersion = "2.0", + gyms = serverGyms, + problems = serverProblems, + sessions = serverSessions, + attempts = serverAttempts, + ) // Simulate merge logic val mergedBackup = performIntelligentMerge(localBackup, serverBackup) @@ -231,12 +231,12 @@ class SyncMergeLogicTest { // Images should be merged (both local and server images preserved) assertTrue( - "Should contain local image", - mergedProblem1.imagePaths!!.contains("local_image.jpg") + "Should contain local image", + mergedProblem1.imagePaths!!.contains("local_image.jpg"), ) assertTrue( - "Should contain server image", - mergedProblem1.imagePaths!!.contains("server_image.jpg") + "Should contain server image", + mergedProblem1.imagePaths!!.contains("server_image.jpg"), ) assertEquals("Should have 2 images total", 2, mergedProblem1.imagePaths!!.size) @@ -246,78 +246,78 @@ class SyncMergeLogicTest { // Verify all sessions are preserved assertTrue( - "Should contain local session", - mergedBackup.sessions.any { it.id == "session1" } + "Should contain local session", + mergedBackup.sessions.any { it.id == "session1" }, ) assertTrue( - "Should contain server session", - mergedBackup.sessions.any { it.id == "session2" } + "Should contain server session", + mergedBackup.sessions.any { it.id == "session2" }, ) // Verify all attempts are preserved assertTrue( - "Should contain local attempt", - mergedBackup.attempts.any { it.id == "attempt1" } + "Should contain local attempt", + mergedBackup.attempts.any { it.id == "attempt1" }, ) assertTrue( - "Should contain server attempt", - mergedBackup.attempts.any { it.id == "attempt2" } + "Should contain server attempt", + mergedBackup.attempts.any { it.id == "attempt2" }, ) } @Test fun `test date comparison logic`() { assertTrue( - "ISO instant should be newer", - isNewerThan("2024-01-01T12:00:00Z", "2024-01-01T10:00:00Z") + "ISO instant should be newer", + isNewerThan("2024-01-01T12:00:00Z", "2024-01-01T10:00:00Z"), ) assertFalse( - "ISO instant should be older", - isNewerThan("2024-01-01T10:00:00Z", "2024-01-01T12:00:00Z") + "ISO instant should be older", + isNewerThan("2024-01-01T10:00:00Z", "2024-01-01T12:00:00Z"), ) assertTrue( - "String comparison should work as fallback", - isNewerThan("2024-01-02T10:00:00", "2024-01-01T10:00:00") + "String comparison should work as fallback", + isNewerThan("2024-01-02T10:00:00", "2024-01-01T10:00:00"), ) } @Test fun `test empty data scenarios`() { val emptyBackup = - ClimbDataBackup( - exportedAt = "2024-01-01T10:00:00", - version = "2.0", - formatVersion = "2.0", - gyms = emptyList(), - problems = emptyList(), - sessions = emptyList(), - attempts = emptyList() - ) + ClimbDataBackup( + exportedAt = "2024-01-01T10:00:00", + version = "2.0", + formatVersion = "2.0", + gyms = emptyList(), + problems = emptyList(), + sessions = emptyList(), + attempts = emptyList(), + ) val dataBackup = - ClimbDataBackup( - exportedAt = "2024-01-01T10:00:00", - version = "2.0", - formatVersion = "2.0", - gyms = - listOf( - BackupGym( - id = "gym1", - name = "Test Gym", - location = null, - supportedClimbTypes = listOf(ClimbType.BOULDER), - difficultySystems = - listOf(DifficultySystem.V_SCALE), - customDifficultyGrades = emptyList(), - notes = null, - createdAt = "2024-01-01T10:00:00", - updatedAt = "2024-01-01T10:00:00" - ) - ), - problems = emptyList(), - sessions = emptyList(), - attempts = emptyList() - ) + ClimbDataBackup( + exportedAt = "2024-01-01T10:00:00", + version = "2.0", + formatVersion = "2.0", + gyms = + listOf( + BackupGym( + id = "gym1", + name = "Test Gym", + location = null, + supportedClimbTypes = listOf(ClimbType.BOULDER), + difficultySystems = + listOf(DifficultySystem.V_SCALE), + customDifficultyGrades = emptyList(), + notes = null, + createdAt = "2024-01-01T10:00:00", + updatedAt = "2024-01-01T10:00:00", + ), + ), + problems = emptyList(), + sessions = emptyList(), + attempts = emptyList(), + ) // Test merging empty with data val merged1 = performIntelligentMerge(emptyBackup, dataBackup) @@ -334,8 +334,8 @@ class SyncMergeLogicTest { // Helper methods that simulate the merge logic from SyncService private fun performIntelligentMerge( - local: ClimbDataBackup, - server: ClimbDataBackup + local: ClimbDataBackup, + server: ClimbDataBackup, ): ClimbDataBackup { val mergedGyms = mergeGyms(local.gyms, server.gyms) val mergedProblems = mergeProblems(local.problems, server.problems) @@ -343,13 +343,13 @@ class SyncMergeLogicTest { val mergedAttempts = mergeAttempts(local.attempts, server.attempts) return ClimbDataBackup( - exportedAt = "2024-01-01T12:00:00", - version = "2.0", - formatVersion = "2.0", - gyms = mergedGyms, - problems = mergedProblems, - sessions = mergedSessions, - attempts = mergedAttempts + exportedAt = "2024-01-01T12:00:00", + version = "2.0", + formatVersion = "2.0", + gyms = mergedGyms, + problems = mergedProblems, + sessions = mergedSessions, + attempts = mergedAttempts, ) } @@ -371,8 +371,8 @@ class SyncMergeLogicTest { } private fun mergeProblems( - local: List, - server: List + local: List, + server: List, ): List { val merged = mutableMapOf() @@ -390,7 +390,7 @@ class SyncMergeLogicTest { serverProblem.imagePaths?.let { allImagePaths.addAll(it) } merged[serverProblem.id] = - serverProblem.withUpdatedImagePaths(allImagePaths.toList()) + serverProblem.withUpdatedImagePaths(allImagePaths.toList()) } } @@ -398,8 +398,8 @@ class SyncMergeLogicTest { } private fun mergeSessions( - local: List, - server: List + local: List, + server: List, ): List { val merged = mutableMapOf() @@ -419,8 +419,8 @@ class SyncMergeLogicTest { } private fun mergeAttempts( - local: List, - server: List + local: List, + server: List, ): List { val merged = mutableMapOf() @@ -431,10 +431,10 @@ class SyncMergeLogicTest { server.forEach { serverAttempt -> val localAttempt = merged[serverAttempt.id] if (localAttempt == null || - isNewerThan( - serverAttempt.updatedAt ?: serverAttempt.createdAt, - localAttempt.updatedAt ?: localAttempt.createdAt - ) + isNewerThan( + serverAttempt.updatedAt ?: serverAttempt.createdAt, + localAttempt.updatedAt ?: localAttempt.createdAt, + ) ) { merged[serverAttempt.id] = serverAttempt } @@ -458,32 +458,32 @@ class SyncMergeLogicTest { @Test fun `test active sessions excluded from sync`() { val allLocalSessions = - listOf( - BackupClimbSession( - id = "active_session_1", - gymId = "gym1", - date = "2024-01-01", - startTime = "2024-01-01T10:00:00", - endTime = null, - duration = null, - status = SessionStatus.ACTIVE, - notes = null, - createdAt = "2024-01-01T10:00:00", - updatedAt = "2024-01-01T10:00:00" - ), - BackupClimbSession( - id = "completed_session_1", - gymId = "gym1", - date = "2023-12-31", - startTime = "2023-12-31T15:00:00", - endTime = "2023-12-31T17:00:00", - duration = 7200000, - status = SessionStatus.COMPLETED, - notes = "Previous session", - createdAt = "2023-12-31T15:00:00", - updatedAt = "2023-12-31T17:00:00" - ) - ) + listOf( + BackupClimbSession( + id = "active_session_1", + gymId = "gym1", + date = "2024-01-01", + startTime = "2024-01-01T10:00:00", + endTime = null, + duration = null, + status = SessionStatus.ACTIVE, + notes = null, + createdAt = "2024-01-01T10:00:00", + updatedAt = "2024-01-01T10:00:00", + ), + BackupClimbSession( + id = "completed_session_1", + gymId = "gym1", + date = "2023-12-31", + startTime = "2023-12-31T15:00:00", + endTime = "2023-12-31T17:00:00", + duration = 7200000, + status = SessionStatus.COMPLETED, + notes = "Previous session", + createdAt = "2023-12-31T15:00:00", + updatedAt = "2023-12-31T17:00:00", + ), + ) // Simulate filtering that would happen in createBackupFromRepository val sessionsForSync = allLocalSessions.filter { it.status != SessionStatus.ACTIVE } @@ -493,18 +493,18 @@ class SyncMergeLogicTest { // Active session should be excluded assertFalse( - "Should not contain active session in sync", - sessionsForSync.any { - it.id == "active_session_1" && it.status == SessionStatus.ACTIVE - } + "Should not contain active session in sync", + sessionsForSync.any { + it.id == "active_session_1" && it.status == SessionStatus.ACTIVE + }, ) // Completed session should be included assertTrue( - "Should contain completed session in sync", - sessionsForSync.any { - it.id == "completed_session_1" && it.status == SessionStatus.COMPLETED - } + "Should contain completed session in sync", + sessionsForSync.any { + it.id == "completed_session_1" && it.status == SessionStatus.COMPLETED + }, ) } } diff --git a/android/app/src/test/java/com/atridad/openclimb/UtilityTests.kt b/android/app/src/test/java/com/atridad/openclimb/UtilityTests.kt index 5f9395c..5f1f56d 100644 --- a/android/app/src/test/java/com/atridad/openclimb/UtilityTests.kt +++ b/android/app/src/test/java/com/atridad/openclimb/UtilityTests.kt @@ -1,10 +1,10 @@ package com.atridad.ascently +import org.junit.Assert.* +import org.junit.Test import java.time.LocalDateTime import java.time.format.DateTimeFormatter import java.util.concurrent.TimeUnit -import org.junit.Assert.* -import org.junit.Test class UtilityTests { @@ -75,13 +75,13 @@ class UtilityTests { @Test fun testClimbingStatistics() { val attempts = - listOf( - AttemptData("SUCCESS", 120), - AttemptData("FALL", 90), - AttemptData("SUCCESS", 150), - AttemptData("FLASH", 60), - AttemptData("FALL", 110) - ) + listOf( + AttemptData("SUCCESS", 120), + AttemptData("FALL", 90), + AttemptData("SUCCESS", 150), + AttemptData("FLASH", 60), + AttemptData("FALL", 110), + ) val stats = calculateAttemptStatistics(attempts) @@ -163,23 +163,23 @@ class UtilityTests { @Test fun testSearchFiltering() { val problems = - listOf( - ProblemData( - "id1", - "Crimpy Problem", - "BOULDER", - "V5", - listOf("crimpy", "overhang") - ), - ProblemData("id2", "Easy Route", "ROPE", "5.6", listOf("beginner", "slab")), - ProblemData( - "id3", - "Hard Boulder", - "BOULDER", - "V10", - listOf("powerful", "roof") - ) - ) + listOf( + ProblemData( + "id1", + "Crimpy Problem", + "BOULDER", + "V5", + listOf("crimpy", "overhang"), + ), + ProblemData("id2", "Easy Route", "ROPE", "5.6", listOf("beginner", "slab")), + ProblemData( + "id3", + "Hard Boulder", + "BOULDER", + "V10", + listOf("powerful", "roof"), + ), + ) val boulderProblems = filterByClimbType(problems, "BOULDER") assertEquals(2, boulderProblems.size) @@ -207,20 +207,20 @@ class UtilityTests { @Test fun testBackupValidation() { val validBackup = - BackupData( - version = "2.0", - formatVersion = "2.0", - exportedAt = "2024-01-01T10:00:00Z", - dataCount = 5 - ) + BackupData( + version = "2.0", + formatVersion = "2.0", + exportedAt = "2024-01-01T10:00:00Z", + dataCount = 5, + ) val invalidBackup = - BackupData( - version = "1.0", - formatVersion = "2.0", - exportedAt = "invalid-date", - dataCount = -1 - ) + BackupData( + version = "1.0", + formatVersion = "2.0", + exportedAt = "invalid-date", + dataCount = -1, + ) assertTrue(isValidBackup(validBackup)) assertFalse(isValidBackup(invalidBackup)) @@ -258,10 +258,10 @@ class UtilityTests { val successRate = (successful.toDouble() / attempts.size) * 100 return AttemptStatistics( - totalAttempts = attempts.size, - successfulAttempts = successful, - successRate = successRate, - averageDuration = avgDuration + totalAttempts = attempts.size, + successfulAttempts = successful, + successRate = successRate, + averageDuration = avgDuration, ) } @@ -301,8 +301,8 @@ class UtilityTests { } private fun filterByClimbType( - problems: List, - climbType: String + problems: List, + climbType: String, ): List { return problems.filter { it.climbType == climbType } } @@ -312,9 +312,9 @@ class UtilityTests { } private fun filterByDifficultyRange( - problems: List, - minGrade: String, - maxGrade: String + problems: List, + minGrade: String, + maxGrade: String, ): List { return problems.filter { problem -> if (problem.climbType == "BOULDER" && problem.difficulty.startsWith("V")) { @@ -329,17 +329,17 @@ class UtilityTests { } private fun mergeData( - local: Map, - server: Map + local: Map, + server: Map, ): Map { return (local.keys + server.keys).associateWith { key -> server[key] ?: local[key]!! } } private fun isValidBackup(backup: BackupData): Boolean { return backup.version == "2.0" && - backup.formatVersion == "2.0" && - backup.exportedAt.matches(Regex("\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}Z")) && - backup.dataCount >= 0 + backup.formatVersion == "2.0" && + backup.exportedAt.matches(Regex("\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}Z")) && + backup.dataCount >= 0 } // Data classes for testing @@ -347,24 +347,24 @@ class UtilityTests { data class AttemptData(val result: String, val duration: Int) data class AttemptStatistics( - val totalAttempts: Int, - val successfulAttempts: Int, - val successRate: Double, - val averageDuration: Double + val totalAttempts: Int, + val successfulAttempts: Int, + val successRate: Double, + val averageDuration: Double, ) data class ProblemData( - val id: String, - val name: String, - val climbType: String, - val difficulty: String, - val tags: List + val id: String, + val name: String, + val climbType: String, + val difficulty: String, + val tags: List, ) data class BackupData( - val version: String, - val formatVersion: String, - val exportedAt: String, - val dataCount: Int + val version: String, + val formatVersion: String, + val exportedAt: String, + val dataCount: Int, ) } diff --git a/android/build.gradle.kts b/android/build.gradle.kts index 952b930..72a97f2 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -3,4 +3,6 @@ plugins { alias(libs.plugins.android.application) apply false alias(libs.plugins.kotlin.android) apply false alias(libs.plugins.kotlin.compose) apply false + alias(libs.plugins.detekt) apply false + alias(libs.plugins.spotless) apply false } \ No newline at end of file diff --git a/android/detekt.yml b/android/detekt.yml new file mode 100644 index 0000000..577fe20 --- /dev/null +++ b/android/detekt.yml @@ -0,0 +1,584 @@ +build: + maxIssues: -1 + excludeCorrectable: false + +config: + validation: true + warningsAsErrors: false + +processors: + active: true + exclude: + - 'DetektProgressListener' + +console-reports: + active: true + +output-reports: + active: true + exclude: + - 'TxtOutputReport' + +complexity: + active: true + ComplexCondition: + active: true + threshold: 5 + CyclomaticComplexMethod: + active: true + threshold: 50 + ignoreSingleWhenExpression: true + ignoreSimpleWhenEntries: true + ignoreNestingFunctions: false + nestingFunctions: + - 'also' + - 'apply' + - 'let' + - 'run' + - 'with' + LabeledExpression: + active: false + LargeClass: + active: true + threshold: 800 + LongMethod: + active: true + threshold: 120 + ignoreAnnotated: + - 'Composable' + - 'Test' + LongParameterList: + active: true + functionThreshold: 15 + constructorThreshold: 15 + ignoreDefaultParameters: true + ignoreDataClasses: true + ignoreAnnotatedParameter: + - 'Composable' + MethodOverloading: + active: false + NamedArguments: + active: false + NestedBlockDepth: + active: true + threshold: 8 + NestedScopeFunctions: + active: true + threshold: 2 + functions: + - 'also' + - 'apply' + - 'let' + - 'run' + - 'with' + ReplaceSafeCallChainWithRun: + active: false + StringLiteralDuplication: + active: false + threshold: 4 + ignoreAnnotation: true + excludeStringsWithLessThan5Characters: true + ignoreStringsRegex: '$^' + TooManyFunctions: + active: true + thresholdInFiles: 40 + thresholdInClasses: 40 + thresholdInInterfaces: 25 + thresholdInObjects: 25 + thresholdInEnums: 15 + ignoreDeprecated: true + ignorePrivate: true + ignoreOverridden: true + +coroutines: + active: true + GlobalCoroutineUsage: + active: true + InjectDispatcher: + active: true + dispatcherNames: + - 'IO' + - 'Default' + - 'Unconfined' + RedundantSuspendModifier: + active: true + SleepInsteadOfDelay: + active: true + SuspendFunSwallowedCancellation: + active: true + SuspendFunWithCoroutineScopeReceiver: + active: true + SuspendFunWithFlowReturnType: + active: true + +empty-blocks: + active: true + EmptyCatchBlock: + active: true + allowedExceptionNameRegex: '_|(ignore|expected).*' + EmptyClassBlock: + active: true + EmptyDefaultConstructor: + active: true + EmptyDoWhileBlock: + active: true + EmptyElseBlock: + active: true + EmptyFinallyBlock: + active: true + EmptyForBlock: + active: true + EmptyFunctionBlock: + active: true + ignoreOverridden: true + EmptyIfBlock: + active: true + EmptyInitBlock: + active: true + EmptyKtFile: + active: true + EmptySecondaryConstructor: + active: true + EmptyTryBlock: + active: true + EmptyWhenBlock: + active: true + EmptyWhileBlock: + active: true + +exceptions: + active: true + ExceptionRaisedInUnexpectedLocation: + active: true + methodNames: + - 'equals' + - 'finalize' + - 'hashCode' + - 'toString' + InstanceOfCheckForException: + active: true + NotImplementedDeclaration: + active: false + ObjectExtendsThrowable: + active: false + PrintStackTrace: + active: true + RethrowCaughtException: + active: true + ReturnFromFinally: + active: true + SwallowedException: + active: false + ignoredExceptionTypes: + - 'InterruptedException' + - 'MalformedURLException' + - 'NumberFormatException' + - 'ParseException' + allowedExceptionNameRegex: '_|(ignore|expected).*' + ThrowingExceptionFromFinally: + active: true + ThrowingExceptionInMain: + active: false + ThrowingExceptionsWithoutMessageOrCause: + active: true + excludes: ['**/test/**', '**/androidTest/**', '**/*.Test.kt', '**/*.Spec.kt', '**/*.Spek.kt'] + exceptions: + - 'ArrayIndexOutOfBoundsException' + - 'Exception' + - 'IllegalArgumentException' + - 'IllegalMonitorStateException' + - 'IllegalStateException' + - 'IndexOutOfBoundsException' + - 'NullPointerException' + - 'RuntimeException' + - 'Throwable' + ThrowingNewInstanceOfSameException: + active: true + TooGenericExceptionCaught: + active: false + excludes: ['**/test/**', '**/androidTest/**', '**/*.Test.kt', '**/*.Spec.kt', '**/*.Spek.kt'] + exceptionNames: + - 'ArrayIndexOutOfBoundsException' + - 'Error' + - 'Exception' + - 'IllegalMonitorStateException' + - 'IndexOutOfBoundsException' + - 'NullPointerException' + - 'RuntimeException' + - 'Throwable' + allowedExceptionNameRegex: '_|(ignore|expected).*' + TooGenericExceptionThrown: + active: false + exceptionNames: + - 'Error' + - 'Exception' + - 'RuntimeException' + - 'Throwable' + +naming: + active: true + BooleanPropertyNaming: + active: true + allowedPattern: '^(is|has|are|should|can|will|does|did)' + ClassNaming: + active: true + classPattern: '[A-Z][a-zA-Z0-9]*' + ConstructorParameterNaming: + active: true + parameterPattern: '[a-z][A-Za-z0-9]*' + privateParameterPattern: '[a-z][A-Za-z0-9]*' + excludeClassPattern: '$^' + EnumNaming: + active: true + enumEntryPattern: '[A-Z][_a-zA-Z0-9]*' + ForbiddenClassName: + active: false + FunctionMaxLength: + active: false + FunctionMinLength: + active: false + FunctionNaming: + active: true + functionPattern: '[a-zA-Z][a-zA-Z0-9]*' + excludeClassPattern: '$^' + ignoreAnnotated: + - 'Composable' + FunctionParameterNaming: + active: true + parameterPattern: '[a-z][A-Za-z0-9]*' + excludeClassPattern: '$^' + InvalidPackageDeclaration: + active: true + rootPackage: 'com.atridad.ascently' + LambdaParameterNaming: + active: true + parameterPattern: '[a-z][A-Za-z0-9]*|_' + MatchingDeclarationName: + active: false + mustBeFirst: true + MemberNameEqualsClassName: + active: true + ignoreOverridden: true + NoNameShadowing: + active: true + NonBooleanPropertyPrefixedWithIs: + active: true + ObjectPropertyNaming: + active: false + PackageNaming: + active: true + packagePattern: '[a-z]+(\.[a-z][A-Za-z0-9]*)*' + TopLevelPropertyNaming: + active: true + constantPattern: '[A-Z][_A-Z0-9]*' + propertyPattern: '[A-Za-z][_A-Za-z0-9]*' + privatePropertyPattern: '_?[A-Za-z][A-Za-z0-9]*' + VariableMaxLength: + active: false + VariableMinLength: + active: false + VariableNaming: + active: true + variablePattern: '[a-z][A-Za-z0-9]*' + privateVariablePattern: '[_a-z][A-Za-z0-9]*' + excludeClassPattern: '$^' + +performance: + active: true + ArrayPrimitive: + active: true + CouldBeSequence: + active: false + ForEachOnRange: + active: true + SpreadOperator: + active: false + UnnecessaryPartOfBinaryExpression: + active: true + UnnecessaryTemporaryInstantiation: + active: true + +potential-bugs: + active: true + AvoidReferentialEquality: + active: true + CastNullableToNonNullableType: + active: true + CastToNullableType: + active: false + Deprecation: + active: false + DontDowncastCollectionTypes: + active: true + DoubleMutabilityForCollection: + active: true + ElseCaseInsteadOfExhaustiveWhen: + active: false + EqualsAlwaysReturnsTrueOrFalse: + active: true + EqualsWithHashCodeExist: + active: true + ExitOutsideMain: + active: false + ExplicitGarbageCollectionCall: + active: true + HasPlatformType: + active: true + IgnoredReturnValue: + active: true + ImplicitDefaultLocale: + active: true + ImplicitUnitReturnType: + active: true + allowExplicitReturnType: true + InvalidRange: + active: true + IteratorHasNextCallsNextMethod: + active: true + IteratorNotThrowingNoSuchElementException: + active: true + LateinitUsage: + active: false + MapGetWithNotNullAssertionOperator: + active: true + MissingPackageDeclaration: + active: true + NullCheckOnMutableProperty: + active: true + NullableToStringCall: + active: true + PropertyUsedBeforeDeclaration: + active: false + UnconditionalJumpStatementInLoop: + active: true + UnnecessaryNotNullCheck: + active: true + UnnecessaryNotNullOperator: + active: true + UnnecessarySafeCall: + active: true + UnreachableCatchBlock: + active: true + UnreachableCode: + active: true + UnsafeCallOnNullableType: + active: true + UnsafeCast: + active: true + UnusedUnaryOperator: + active: true + UselessPostfixExpression: + active: true + WrongEqualsTypeParameter: + active: true + +style: + active: true + AlsoCouldBeApply: + active: false + BracesOnIfStatements: + active: false + singleLine: 'never' + multiLine: 'always' + BracesOnWhenStatements: + active: false + singleLine: 'necessary' + multiLine: 'necessary' + CanBeNonNullable: + active: true + CascadingCallWrapping: + active: false + ClassOrdering: + active: false + CollapsibleIfStatements: + active: false + DataClassContainsFunctions: + active: false + DataClassShouldBeImmutable: + active: true + DestructuringDeclarationWithTooManyEntries: + active: true + maxDestructuringEntries: 5 + EqualsNullCall: + active: true + EqualsOnSignatureLine: + active: true + ExplicitCollectionElementAccessMethod: + active: true + ExplicitItLambdaParameter: + active: false + ExpressionBodySyntax: + active: false + includeLineWrapping: false + ForbiddenAnnotation: + active: false + ForbiddenComment: + active: false + ForbiddenImport: + active: false + ForbiddenMethodCall: + active: false + ForbiddenSuppress: + active: false + ForbiddenVoid: + active: true + ignoreOverridden: true + ignoreUsageInGenerics: true + FunctionOnlyReturningConstant: + active: false + ignoreOverridableFunction: true + ignoreActualFunction: true + excludedFunctions: [] + LoopWithTooManyJumpStatements: + active: true + maxJumpCount: 2 + MagicNumber: + active: false + MandatoryBracesLoops: + active: true + MaxChainedCallsOnSameLine: + active: true + maxChainedCalls: 5 + MaxLineLength: + active: true + maxLineLength: 220 + excludePackageStatements: true + excludeImportStatements: true + excludeCommentStatements: true + excludeRawStrings: true + MayBeConst: + active: true + ModifierOrder: + active: true + MultilineRawStringIndentation: + active: false + indentSize: 4 + MultilineLambdaItParameter: + active: true + NestedClassesVisibility: + active: true + NewLineAtEndOfFile: + active: false + NoTabs: + active: true + NullableBooleanCheck: + active: true + ObjectLiteralToLambda: + active: true + OptionalAbstractKeyword: + active: true + OptionalUnit: + active: true + PreferToOverPairSyntax: + active: true + ProtectedMemberInFinalClass: + active: true + RedundantExplicitType: + active: true + RedundantHigherOrderMapUsage: + active: true + RedundantVisibilityModifierRule: + active: false + ReturnCount: + active: true + max: 6 + excludedFunctions: + - 'equals' + excludeLabeled: true + excludeReturnFromLambda: true + excludeGuardClauses: true + SafeCast: + active: true + SerialVersionUIDInSerializableClass: + active: false + SpacingBetweenPackageAndImports: + active: true + StringShouldBeRawString: + active: false + ThrowsCount: + active: true + max: 10 + excludeGuardClauses: true + TrailingWhitespace: + active: false + TrimMultilineRawString: + active: true + UnderscoresInNumericLiterals: + active: false + acceptableLength: 4 + allowNonStandardGrouping: false + UnnecessaryAbstractClass: + active: true + UnnecessaryAnnotationUseSiteTarget: + active: true + UnnecessaryApply: + active: true + UnnecessaryBackticks: + active: true + UnnecessaryBracesAroundTrailingLambda: + active: true + UnnecessaryFilter: + active: true + UnnecessaryInheritance: + active: true + UnnecessaryInnerClass: + active: true + UnnecessaryLet: + active: true + UnnecessaryParentheses: + active: false + allowForUnclearPrecedence: true + UntilInsteadOfRangeTo: + active: true + UnusedImports: + active: true + UnusedParameter: + active: true + allowedNames: 'ignored|expected|_|session|startTime|endTime|xAxisFormatter' + UnusedPrivateClass: + active: true + UnusedPrivateMember: + active: true + allowedNames: '(_|ignored|expected|serialVersionUID)' + UnusedPrivateProperty: + active: true + allowedNames: '_|ignored|expected|serialVersionUID' + UseAnyOrNoneInsteadOfFind: + active: true + UseArrayLiteralsInAnnotations: + active: true + UseCheckNotNull: + active: true + UseCheckOrError: + active: true + UseDataClass: + active: false + UseEmptyCounterpart: + active: true + UseIfEmptyOrIfBlank: + active: true + UseIfInsteadOfWhen: + active: false + UseIsNullOrEmpty: + active: true + UseLet: + active: false + UseOrEmpty: + active: true + UseRequire: + active: true + UseRequireNotNull: + active: true + UseSumOfInsteadOfFlatMapSize: + active: true + UselessCallOnNotNull: + active: true + UtilityClassWithPublicConstructor: + active: true + VarCouldBeVal: + active: true + WildcardImport: + active: false + excludeImports: + - 'java.util.*' + - 'kotlinx.android.synthetic.*' diff --git a/android/gradle.properties b/android/gradle.properties index 20e2a01..1b8231d 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -10,7 +10,11 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. For more details, visit # https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects -# org.gradle.parallel=true +org.gradle.parallel=true +# Enable Gradle build caching for faster incremental builds +org.gradle.caching=true +# Enable configuration caching for faster configuration phase +org.gradle.configuration-cache=true # AndroidX package structure to make it clearer which packages are bundled with the # Android operating system, and which are packaged with your app's APK # https://developer.android.com/topic/libraries/support-library/androidx-rn diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index 8517f13..f99e0ab 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -20,6 +20,9 @@ kotlinxCoroutines = "1.10.2" coil = "2.7.0" ksp = "2.2.20-2.0.3" exifinterface = "1.4.1" +healthConnect = "1.1.0-alpha07" +detekt = "1.23.7" +spotless = "6.25.0" [libraries] androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } @@ -69,9 +72,14 @@ mockk = { group = "io.mockk", name = "mockk", version = "1.14.6" } coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil" } androidx-exifinterface = { group = "androidx.exifinterface", name = "exifinterface", version.ref = "exifinterface" } +# Health Connect +health-connect = { group = "androidx.health.connect", name = "connect-client", version.ref = "healthConnect" } + [plugins] android-application = { id = "com.android.application", version.ref = "agp" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } +detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } +spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } diff --git a/ios/.editorconfig b/ios/.editorconfig new file mode 100644 index 0000000..ed8a007 --- /dev/null +++ b/ios/.editorconfig @@ -0,0 +1,22 @@ +root = true + +[*] +indent_style = space +indent_size = 4 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[*.swift] +indent_size = 4 +max_line_length = 140 + +[*.{plist,storyboard,xib,xcscheme,xcworkspacedata}] +indent_size = 2 + +[*.md] +trim_trailing_whitespace = false + +[Makefile] +indent_style = tab diff --git a/ios/.swiftformat b/ios/.swiftformat new file mode 100644 index 0000000..f6afcad --- /dev/null +++ b/ios/.swiftformat @@ -0,0 +1,68 @@ +# SwiftFormat Configuration for Ascently iOS +# Maintains consistent formatting across the project + +# File options +--exclude build,Pods,DerivedData,.build + +# Format options +--swiftversion 6.0 +--indent 4 +--tabwidth 4 +--maxwidth 140 +--wraparguments before-first +--wrapparameters before-first +--wrapcollections before-first +--wrapconditions after-first +--wrapreturntype preserve +--wrapeffects preserve +--closingparen balanced +--funcattributes prev-line +--typeattributes prev-line +--varattributes preserve +--storedvarattrs same-line +--computedvarattrs preserve +--complexattributes prev-line +--typeblanklines preserve +--structthreshold 20 +--enumthreshold 20 +--extensionacl on-declarations +--organizetypes class,struct,enum,extension,protocol +--modifierorder acl,setteracl,override,static,final,required,convenience,lazy,dynamic +--self remove +--importgrouping alpha +--semicolons inline +--operatorfunc spaced +--nospaceoperators ..<,... +--ranges no-space +--emptybraces no-space +--trimwhitespace always +--stripunusedargs closure-only +--header ignore +--guardelse auto +--elseposition same-line +--shortoptionals always +--linebreaks lf +--xcodeindentation disabled +--fragment false +--conflictmarkers reject +--ifdef no-indent +--extensionlength 0 + +# Enable rules +--enable isEmpty,sortedSwitchCases,redundantInit,redundantGet,redundantObjc +--enable blankLineAfterSwitchCase,consecutiveSpaces,duplicateImports +--enable elseOnSameLine,emptyBraces,hoistAwait,hoistPatternLet,hoistTry +--enable leadingDelimiters,redundantBackticks,redundantBreak,redundantClosure +--enable redundantExtensionACL,redundantFileprivate,redundantLetError +--enable redundantNilInit,redundantParens,redundantPattern,redundantRawValues +--enable redundantReturn,redundantSelf,redundantType,redundantVoidReturnType +--enable semicolons,sortImports,spaceAroundBraces,spaceAroundBrackets +--enable spaceAroundComments,spaceAroundGenerics,spaceAroundOperators +--enable spaceAroundParens,spaceInsideBraces,spaceInsideBrackets +--enable spaceInsideComments,spaceInsideGenerics,spaceInsideParens +--enable strongOutlets,strongifiedSelf,todos,trailingClosures,trailingCommas +--enable typeSugar,unusedArguments,void,wrapArguments,wrapAttributes +--enable yodaConditions,blankLinesBetweenScopes,blankLinesAtEndOfScope + +# Disable rules +--disable wrapMultilineStatementBraces diff --git a/ios/.swiftlint.yml b/ios/.swiftlint.yml new file mode 100644 index 0000000..1005148 --- /dev/null +++ b/ios/.swiftlint.yml @@ -0,0 +1,139 @@ +excluded: + - build + - Pods + - DerivedData + - .build + - AscentlyTests + +disabled_rules: + - trailing_whitespace + - todo + - nesting + - opening_brace + - multiple_closures_with_trailing_closure + - trailing_comma + - attributes + - function_parameter_count + - large_tuple + +opt_in_rules: + - empty_count + - explicit_init + - closure_spacing + - overridden_super_call + - redundant_nil_coalescing + - first_where + - sorted_first_last + - contains_over_filter_count + - contains_over_filter_is_empty + - empty_string + - prefer_zero_over_explicit_init + - flatmap_over_map_reduce + - last_where + - sorted_imports + - toggle_bool + - unavailable_function + - unneeded_parentheses_in_closure_argument + - vertical_whitespace_closing_braces + - yoda_condition + - collection_alignment + - literal_expression_end_indentation + +line_length: + warning: 140 + error: 250 + ignores_comments: true + ignores_urls: true + ignores_function_declarations: true + ignores_interpolated_strings: true + +type_body_length: + warning: 600 + error: 1000 + +file_length: + warning: 1000 + error: 1500 + ignore_comment_only_lines: true + +function_body_length: + warning: 100 + error: 200 + +cyclomatic_complexity: + warning: 20 + error: 30 + ignores_case_statements: true + +identifier_name: + min_length: + warning: 2 + error: 1 + max_length: + warning: 50 + error: 60 + validates_start_with_lowercase: error + allowed_symbols: + - _ + excluded: + - id + - i + - j + - x + - y + - z + - to + - at + - or + - is + - no + - go + - db + - DATA_JSON_FILENAME + - IMAGES_DIR_NAME + - METADATA_FILENAME + # ViewBuilder section functions (SwiftUI convention) + - StatusSection + - IconDisplaySection + - DebugSection + - TestingSection + - ResultsSection + - GymSelectionSection + - SessionDetailsSection + - ProblemSelectionSection + - CreateProblemSection + - AttemptDetailsSection + - BasicInfoSection + - ClimbTypesSection + - DifficultySystemsSection + - NotesSection + - ClimbTypeSection + - DifficultySection + - LocationSection + - TagsSection + - PhotosSection + - AdditionalInfoSection + +type_name: + min_length: + warning: 3 + error: 2 + max_length: + warning: 50 + error: 60 + +force_cast: warning + +force_try: warning + +large_tuple: + warning: 4 + error: 6 + +nesting: + type_level: + warning: 3 + function_level: + warning: 5 + +reporter: "xcode" diff --git a/ios/Ascently.xcodeproj/project.pbxproj b/ios/Ascently.xcodeproj/project.pbxproj index dccd08b..be58a1b 100644 --- a/ios/Ascently.xcodeproj/project.pbxproj +++ b/ios/Ascently.xcodeproj/project.pbxproj @@ -465,7 +465,7 @@ CODE_SIGN_ENTITLEMENTS = Ascently/Ascently.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 38; + CURRENT_PROJECT_VERSION = 39; DEVELOPMENT_TEAM = 4BC9Y2LL4B; DRIVERKIT_DEPLOYMENT_TARGET = 24.6; ENABLE_PREVIEWS = YES; @@ -487,7 +487,7 @@ "@executable_path/Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 15.6; - MARKETING_VERSION = 2.5.1; + MARKETING_VERSION = 2.5.2; PRODUCT_BUNDLE_IDENTIFIER = com.atridad.Ascently; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -513,7 +513,7 @@ CODE_SIGN_ENTITLEMENTS = Ascently/Ascently.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 38; + CURRENT_PROJECT_VERSION = 39; DEVELOPMENT_TEAM = 4BC9Y2LL4B; DRIVERKIT_DEPLOYMENT_TARGET = 24.6; ENABLE_PREVIEWS = YES; @@ -535,7 +535,7 @@ "@executable_path/Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 15.6; - MARKETING_VERSION = 2.5.1; + MARKETING_VERSION = 2.5.2; PRODUCT_BUNDLE_IDENTIFIER = com.atridad.Ascently; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -602,7 +602,7 @@ ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground; CODE_SIGN_ENTITLEMENTS = SessionStatusLiveExtension.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 38; + CURRENT_PROJECT_VERSION = 39; DEVELOPMENT_TEAM = 4BC9Y2LL4B; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = SessionStatusLive/Info.plist; @@ -613,7 +613,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2.5.1; + MARKETING_VERSION = 2.5.2; PRODUCT_BUNDLE_IDENTIFIER = com.atridad.Ascently.SessionStatusLive; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -632,7 +632,7 @@ ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground; CODE_SIGN_ENTITLEMENTS = SessionStatusLiveExtension.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 38; + CURRENT_PROJECT_VERSION = 39; DEVELOPMENT_TEAM = 4BC9Y2LL4B; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = SessionStatusLive/Info.plist; @@ -643,7 +643,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2.5.1; + MARKETING_VERSION = 2.5.2; PRODUCT_BUNDLE_IDENTIFIER = com.atridad.Ascently.SessionStatusLive; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; diff --git a/ios/Ascently.xcodeproj/project.xcworkspace/xcuserdata/atridad.xcuserdatad/UserInterfaceState.xcuserstate b/ios/Ascently.xcodeproj/project.xcworkspace/xcuserdata/atridad.xcuserdatad/UserInterfaceState.xcuserstate index eedb83d..5b46cb9 100644 Binary files a/ios/Ascently.xcodeproj/project.xcworkspace/xcuserdata/atridad.xcuserdatad/UserInterfaceState.xcuserstate and b/ios/Ascently.xcodeproj/project.xcworkspace/xcuserdata/atridad.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/ios/Ascently/ContentView.swift b/ios/Ascently/ContentView.swift index 9e178ef..a0fb895 100644 --- a/ios/Ascently/ContentView.swift +++ b/ios/Ascently/ContentView.swift @@ -45,7 +45,7 @@ struct ContentView: View { } .environmentObject(dataManager) .environmentObject(MusicService.shared) - .onChange(of: scenePhase) { oldPhase, newPhase in + .onChange(of: scenePhase) { _, newPhase in if newPhase == .active { // Add slight delay to ensure app is fully loaded Task { diff --git a/ios/Ascently/Services/MusicService.swift b/ios/Ascently/Services/MusicService.swift index cc0fd7e..6c2d6a2 100644 --- a/ios/Ascently/Services/MusicService.swift +++ b/ios/Ascently/Services/MusicService.swift @@ -1,7 +1,7 @@ -import MusicKit import AVFoundation -import SwiftUI import Combine +import MusicKit +import SwiftUI @MainActor class MusicService: ObservableObject { diff --git a/ios/Ascently/Services/Sync/ServerSyncProvider.swift b/ios/Ascently/Services/Sync/ServerSyncProvider.swift index 167a33f..132522a 100644 --- a/ios/Ascently/Services/Sync/ServerSyncProvider.swift +++ b/ios/Ascently/Services/Sync/ServerSyncProvider.swift @@ -1,5 +1,5 @@ -import Foundation import Combine +import Foundation class ServerSyncProvider: SyncProvider { var type: SyncProviderType { .server } @@ -235,7 +235,7 @@ class ServerSyncProvider: SyncProvider { }.map { problem -> BackupProblem in let backupProblem = BackupProblem(from: problem) if !problem.imagePaths.isEmpty { - let normalizedPaths = problem.imagePaths.enumerated().map { index, _ in + let normalizedPaths = problem.imagePaths.indices.map { index in ImageNamingUtils.generateImageFilename( problemId: problem.id.uuidString, imageIndex: index) } @@ -859,7 +859,6 @@ class ServerSyncProvider: SyncProvider { attempts: filteredAttempts, deletedItems: backup.deletedItems ) - } else { // Filter out deleted items even when no image path mapping let deletedGymIds = Set( @@ -930,7 +929,6 @@ class ServerSyncProvider: SyncProvider { // Update local data state to match imported data timestamp DataStateManager.shared.setLastModified(backup.exportedAt) AppLogger.info("Data state synchronized to imported timestamp: \(backup.exportedAt)", tag: logTag) - } catch { throw SyncError.importFailed(error) } diff --git a/ios/Ascently/Services/Sync/SyncMerger.swift b/ios/Ascently/Services/Sync/SyncMerger.swift index e942748..8600400 100644 --- a/ios/Ascently/Services/Sync/SyncMerger.swift +++ b/ios/Ascently/Services/Sync/SyncMerger.swift @@ -153,9 +153,7 @@ struct SyncMerger { let activeSessionIds = Set( local.compactMap { attempt in return attempt.sessionId - }.filter { sessionId in - // Check if this session ID belongs to an active session - // For now, we'll be conservative and not delete attempts during merge + }.filter { _ in return true }) diff --git a/ios/Ascently/Services/SyncService.swift b/ios/Ascently/Services/SyncService.swift index 31c9138..8ce7cb1 100644 --- a/ios/Ascently/Services/SyncService.swift +++ b/ios/Ascently/Services/SyncService.swift @@ -133,7 +133,6 @@ class SyncService: ObservableObject { if let lastSync = userDefaults.object(forKey: Keys.lastSyncTime) as? Date { self.lastSyncTime = lastSync } - } catch { syncError = error.localizedDescription throw error diff --git a/ios/Ascently/Utils/ImageManager.swift b/ios/Ascently/Utils/ImageManager.swift index 5e20ee7..35ab051 100644 --- a/ios/Ascently/Utils/ImageManager.swift +++ b/ios/Ascently/Utils/ImageManager.swift @@ -238,7 +238,6 @@ class ImageManager { saveMigrationState(initialState) performMigrationWithCheckpoints(files: allLegacyFiles, currentState: initialState) - } catch { logError("ERROR: Failed to start migration: \(error)") } @@ -255,7 +254,6 @@ class ImageManager { logInfo("Resuming with \(remainingFiles.count) remaining files") performMigrationWithCheckpoints(files: remainingFiles, currentState: state) - } catch { logError("ERROR: Failed to resume migration: \(error)") // Fallback: start fresh @@ -325,7 +323,6 @@ class ImageManager { migratedCount += 1 logInfo("Migrated: \(fileName) (\(migratedCount)/\(currentState.totalFiles))") - } catch { failedCount += 1 logError("ERROR: Failed to migrate \(fileName): \(error)") @@ -676,7 +673,7 @@ class ImageManager { for fileName in files { let filePath = imagesDirectory.appendingPathComponent(fileName) - if let data = try? Data(contentsOf: filePath), data.count > 0 { + if let data = try? Data(contentsOf: filePath), !data.isEmpty { // Basic validation - check if file has content and is reasonable size if data.count > 100 { // Minimum viable image size validFiles += 1 @@ -825,7 +822,7 @@ class ImageManager { let primaryEmpty = (try? fileManager.contentsOfDirectory(atPath: imagesDirectory.path).isEmpty) ?? true let backupHasFiles = - ((try? fileManager.contentsOfDirectory(atPath: backupDirectory.path)) ?? []).count > 0 + !((try? fileManager.contentsOfDirectory(atPath: backupDirectory.path)) ?? []).isEmpty if primaryEmpty && backupHasFiles { logDebug("DEBUG SAFE: Primary empty but backup exists - restoring") @@ -944,7 +941,6 @@ class ImageManager { } logInfo("Completed migration from previous Application Support directory") - } catch { logError("ERROR: Failed to migrate from previous Application Support: \(error)") } diff --git a/ios/Ascently/Utils/ThemeManager.swift b/ios/Ascently/Utils/ThemeManager.swift index 38c4a14..65deb25 100644 --- a/ios/Ascently/Utils/ThemeManager.swift +++ b/ios/Ascently/Utils/ThemeManager.swift @@ -1,5 +1,5 @@ -import SwiftUI import Combine +import SwiftUI class ThemeManager: ObservableObject { @Published var accentColor: Color = .blue { diff --git a/ios/Ascently/Utils/ZipUtils.swift b/ios/Ascently/Utils/ZipUtils.swift index 9ca275f..83a5a67 100644 --- a/ios/Ascently/Utils/ZipUtils.swift +++ b/ios/Ascently/Utils/ZipUtils.swift @@ -73,7 +73,7 @@ struct ZipUtils { do { let imageData = try Data(contentsOf: imageURL) - if imageData.count > 0 { + if !imageData.isEmpty { let imageEntryName = "\(IMAGES_DIR_NAME)/\(imageName)" try addFileToZip( filename: imageEntryName, diff --git a/ios/Ascently/Views/AddEdit/AddAttemptView.swift b/ios/Ascently/Views/AddEdit/AddAttemptView.swift index 4aa8723..ab24c93 100644 --- a/ios/Ascently/Views/AddEdit/AddAttemptView.swift +++ b/ios/Ascently/Views/AddEdit/AddAttemptView.swift @@ -526,7 +526,6 @@ struct AddAttemptView: View { dismiss() } - } struct ProblemSelectionRow: View { @@ -1302,7 +1301,6 @@ struct EditAttemptView: View { dismiss() } - } #Preview { diff --git a/ios/Ascently/Views/AddEdit/AddEditProblemView.swift b/ios/Ascently/Views/AddEdit/AddEditProblemView.swift index 9478fab..90ad078 100644 --- a/ios/Ascently/Views/AddEdit/AddEditProblemView.swift +++ b/ios/Ascently/Views/AddEdit/AddEditProblemView.swift @@ -168,7 +168,6 @@ struct AddEditProblemView: View { await loadSelectedPhotos() } } - } @ViewBuilder @@ -224,7 +223,6 @@ struct AddEditProblemView: View { .fill(.quaternary) ) } - } } diff --git a/ios/Ascently/Views/AnalyticsView.swift b/ios/Ascently/Views/AnalyticsView.swift index c61f886..a45405e 100644 --- a/ios/Ascently/Views/AnalyticsView.swift +++ b/ios/Ascently/Views/AnalyticsView.swift @@ -366,7 +366,7 @@ struct BarChartView: View { ) } else { VStack(alignment: .leading) { - // Chart area + // Chart area HStack(alignment: .bottom, spacing: spacing / CGFloat(sortedData.count)) { ForEach(Array(sortedData.enumerated()), id: \.offset) { index, gradeCount in VStack(spacing: 4) { diff --git a/ios/Ascently/Views/Detail/SessionDetailView.swift b/ios/Ascently/Views/Detail/SessionDetailView.swift index f35620e..d522c85 100644 --- a/ios/Ascently/Views/Detail/SessionDetailView.swift +++ b/ios/Ascently/Views/Detail/SessionDetailView.swift @@ -231,7 +231,6 @@ struct SessionDetailView: View { uniqueProblemsCompleted: completedProblems.count ) } - } struct SessionHeaderCard: View { @@ -305,7 +304,6 @@ struct SessionHeaderCard: View { formatter.dateStyle = .full return formatter.string(from: date) } - } struct SessionStatsCard: View { diff --git a/ios/Ascently/Views/ProblemsView.swift b/ios/Ascently/Views/ProblemsView.swift index e0c6765..611fc1f 100644 --- a/ios/Ascently/Views/ProblemsView.swift +++ b/ios/Ascently/Views/ProblemsView.swift @@ -182,7 +182,8 @@ struct ProblemsView: View { Button(action: { showingFilters = true }) { - Image(systemName: (selectedClimbType != nil || selectedGym != nil) ? "line.3.horizontal.decrease.circle.fill" : "line.3.horizontal.decrease.circle") + let hasFilters = selectedClimbType != nil || selectedGym != nil + Image(systemName: hasFilters ? "line.3.horizontal.decrease.circle.fill" : "line.3.horizontal.decrease.circle") .font(.system(size: 16, weight: .medium)) .foregroundColor(themeManager.accentColor) } @@ -365,7 +366,6 @@ struct FilterSection: View { } } } - } struct FilterChip: View { @@ -392,8 +392,6 @@ struct FilterChip: View { } } - - struct ProblemRow: View { let problem: Problem @EnvironmentObject var dataManager: ClimbingDataManager diff --git a/ios/Ascently/Views/SessionsView.swift b/ios/Ascently/Views/SessionsView.swift index 1b13aa2..18dfafc 100644 --- a/ios/Ascently/Views/SessionsView.swift +++ b/ios/Ascently/Views/SessionsView.swift @@ -256,7 +256,6 @@ struct ActiveSessionBanner: View { SessionDetailView(sessionId: session.id) } } - } struct SessionRow: View { diff --git a/ios/Ascently/Views/SettingsView.swift b/ios/Ascently/Views/SettingsView.swift index e2480fe..9c23fee 100644 --- a/ios/Ascently/Views/SettingsView.swift +++ b/ios/Ascently/Views/SettingsView.swift @@ -251,9 +251,16 @@ struct DataManagementSection: View { dataManager.resetAllData() } } message: { - Text( - "Are you sure you want to reset all data? This will permanently delete:\n\n• All gyms and their information\n• All problems and their images\n• All climbing sessions\n• All attempts and progress data\n\nThis action cannot be undone. Consider exporting your data first." - ) + Text(""" + Are you sure you want to reset all data? This will permanently delete: + + • All gyms and their information + • All problems and their images + • All climbing sessions + • All attempts and progress data + + This action cannot be undone. Consider exporting your data first. + """) } .alert("Delete All Images", isPresented: $showingDeleteImagesAlert) { @@ -262,9 +269,14 @@ struct DataManagementSection: View { deleteAllImages() } } message: { - Text( - "This will permanently delete ALL image files from your device.\n\nProblems will keep their references but the actual image files will be removed. This cannot be undone.\n\nConsider exporting your data first if you want to keep your images." - ) + Text(""" + This will permanently delete ALL image files from your device. + + Problems will keep their references but the actual image files will be removed. \ + This cannot be undone. + + Consider exporting your data first if you want to keep your images. + """) } } @@ -651,7 +663,6 @@ struct SyncSection: View { .foregroundColor(.red) .padding(.leading, 24) } - } } .sheet(isPresented: $showingSyncSettings) { diff --git a/ios/SessionStatusLive/SessionStatusLiveLiveActivity.swift b/ios/SessionStatusLive/SessionStatusLiveLiveActivity.swift index 18aa5f8..64194aa 100644 --- a/ios/SessionStatusLive/SessionStatusLiveLiveActivity.swift +++ b/ios/SessionStatusLive/SessionStatusLiveLiveActivity.swift @@ -22,7 +22,6 @@ struct SessionStatusLiveLiveActivity: Widget { LiveActivityView(context: context) .activityBackgroundTint(Color.blue.opacity(0.2)) .activitySystemActionForegroundColor(Color.primary) - } dynamicIsland: { context in DynamicIsland { DynamicIslandExpandedRegion(.leading) {