From 7e950baf6128e3bc138aa9666d4e9effd5882ea2 Mon Sep 17 00:00:00 2001 From: fy59 Date: Sun, 6 Sep 2026 14:29:59 +0200 Subject: [PATCH] Add functional Android local client --- CHANGELOG.md | 15 + android/.gitignore | 5 + android/.gitkeep | 0 android/README.md | 77 ++ android/app/build.gradle.kts | 54 ++ android/app/src/main/AndroidManifest.xml | 25 + .../com/labfytools/trainlog/MainActivity.kt | 29 + .../labfytools/trainlog/model/BodyModels.kt | 66 ++ .../trainlog/model/ExerciseProfile.kt | 72 ++ .../trainlog/model/SessionModels.kt | 40 + .../com/labfytools/trainlog/ui/BodyScreen.kt | 601 ++++++++++++ .../labfytools/trainlog/ui/ExerciseScreen.kt | 487 ++++++++++ .../labfytools/trainlog/ui/HistoryScreen.kt | 74 ++ .../com/labfytools/trainlog/ui/HomeScreen.kt | 68 ++ .../trainlog/ui/SessionDetailScreen.kt | 186 ++++ .../labfytools/trainlog/ui/SessionScreen.kt | 879 ++++++++++++++++++ .../com/labfytools/trainlog/ui/TrainlogApp.kt | 167 ++++ .../trainlog/ui/TrainlogComponents.kt | 261 ++++++ .../trainlog/ui/theme/TrainlogTheme.kt | 78 ++ .../res/drawable/ic_launcher_foreground.xml | 12 + .../res/mipmap-anydpi-v26/ic_launcher.xml | 13 + .../mipmap-anydpi-v26/ic_launcher_round.xml | 13 + android/app/src/main/res/values/colors.xml | 14 + android/app/src/main/res/values/strings.xml | 4 + android/app/src/main/res/values/themes.xml | 35 + android/build.gradle.kts | 4 + android/gradle.properties | 4 + android/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 47505 bytes .../gradle/wrapper/gradle-wrapper.properties | 9 + android/gradlew | 248 +++++ android/gradlew.bat | 82 ++ android/settings.gradle.kts | 21 + docs/android.md | 283 ++++++ docs/reviews/android_local_workflows.md | 217 +++++ docs/roadmap.md | 27 + 35 files changed, 4170 insertions(+) create mode 100644 android/.gitignore delete mode 100644 android/.gitkeep create mode 100644 android/README.md create mode 100644 android/app/build.gradle.kts create mode 100644 android/app/src/main/AndroidManifest.xml create mode 100644 android/app/src/main/java/com/labfytools/trainlog/MainActivity.kt create mode 100644 android/app/src/main/java/com/labfytools/trainlog/model/BodyModels.kt create mode 100644 android/app/src/main/java/com/labfytools/trainlog/model/ExerciseProfile.kt create mode 100644 android/app/src/main/java/com/labfytools/trainlog/model/SessionModels.kt create mode 100644 android/app/src/main/java/com/labfytools/trainlog/ui/BodyScreen.kt create mode 100644 android/app/src/main/java/com/labfytools/trainlog/ui/ExerciseScreen.kt create mode 100644 android/app/src/main/java/com/labfytools/trainlog/ui/HistoryScreen.kt create mode 100644 android/app/src/main/java/com/labfytools/trainlog/ui/HomeScreen.kt create mode 100644 android/app/src/main/java/com/labfytools/trainlog/ui/SessionDetailScreen.kt create mode 100644 android/app/src/main/java/com/labfytools/trainlog/ui/SessionScreen.kt create mode 100644 android/app/src/main/java/com/labfytools/trainlog/ui/TrainlogApp.kt create mode 100644 android/app/src/main/java/com/labfytools/trainlog/ui/TrainlogComponents.kt create mode 100644 android/app/src/main/java/com/labfytools/trainlog/ui/theme/TrainlogTheme.kt create mode 100644 android/app/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 android/app/src/main/res/values/colors.xml create mode 100644 android/app/src/main/res/values/strings.xml create mode 100644 android/app/src/main/res/values/themes.xml create mode 100644 android/build.gradle.kts create mode 100644 android/gradle.properties create mode 100644 android/gradle/wrapper/gradle-wrapper.jar create mode 100644 android/gradle/wrapper/gradle-wrapper.properties create mode 100755 android/gradlew create mode 100644 android/gradlew.bat create mode 100644 android/settings.gradle.kts create mode 100644 docs/reviews/android_local_workflows.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 0429bc2..e587d0b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -170,3 +170,18 @@ Next: - made continuous TUI duration entry explicitly minute-based; - preserved frozen session JSON v1 unchanged. + + +### Android local client + +- added native Kotlin/Jetpack Compose Android client; +- matched Trainlog TUI visual language; +- added minimal themed `T` launcher icon; +- added exercise catalog and profile-aware exercise creation; +- added inline exercise creation from session recording; +- added persistent local session recording; +- preserved SETS versus CONTINUOUS persistence semantics; +- added local session history and detail views; +- added persistent body measurement recording; +- validated the application on a real Samsung device through ADB. + diff --git a/android/.gitignore b/android/.gitignore new file mode 100644 index 0000000..ebc00fe --- /dev/null +++ b/android/.gitignore @@ -0,0 +1,5 @@ +.gradle/ +.idea/ +local.properties +**/build/ +*.iml diff --git a/android/.gitkeep b/android/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/android/README.md b/android/README.md new file mode 100644 index 0000000..47ffb0f --- /dev/null +++ b/android/README.md @@ -0,0 +1,77 @@ +# Trainlog Android + +## Current status + +```text +ANDROID_SCAFFOLD=IMPLEMENTED +ANDROID_THEME_PARITY=IMPLEMENTED +ANDROID_HOME=IMPLEMENTED +ANDROID_SESSION_SHELL=IMPLEMENTED +ANDROID_INLINE_EXERCISE_ROUTE=IMPLEMENTED +ANDROID_EXERCISE_SHELL=IMPLEMENTED +ANDROID_BODY_SHELL=IMPLEMENTED + +LOCAL_PERSISTENCE=NEXT +MTP_SYNC=AFTER_LOCAL_WORKFLOW +``` + +## Visual contract + +The application follows the same Trainlog language as the TUI: + +```text +dark background +monospace typography +cyan/teal accent +yellow active frame +green success +red error +blue muted/navigation +magenta graph role +``` + +The launcher icon is only a themed `T`. + +## Navigation + +```text +Accueil +├── Enregistrer une séance +│ └── Créer un nouvel exercice +│ └── retour séance +├── Enregistrer un exercice +└── Enregistrer des mensurations +``` + +## Exercise contract + +Android must consume the same model as the desktop application: + +```text +recording_mode +tracking_mode +data_fields +``` + +No exercise input form may be inferred from its name. + +## Toolchain + +```text +AGP 9.4.0 +Gradle 9.6 +Kotlin 2.3.21 +Compose BOM 2026.08.00 +compileSdk 37 +targetSdk 36 +minSdk 26 +JDK 17 +``` + +A Gradle wrapper is intentionally not committed by the scaffold script unless +it can be generated locally. From this directory: + +```bash +gradle wrapper --gradle-version 9.6.0 +./gradlew assembleDebug +``` diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts new file mode 100644 index 0000000..59a3038 --- /dev/null +++ b/android/app/build.gradle.kts @@ -0,0 +1,54 @@ +plugins { + id("com.android.application") + id("org.jetbrains.kotlin.plugin.compose") +} + +android { + namespace = "com.labfytools.trainlog" + compileSdk = 37 + + defaultConfig { + applicationId = "com.labfytools.trainlog" + minSdk = 26 + targetSdk = 36 + + versionCode = 1 + versionName = "0.1.0" + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + buildFeatures { + compose = true + } +} + +dependencies { + val composeBom = + platform("androidx.compose:compose-bom:2026.08.00") + + implementation(composeBom) + + implementation( + "androidx.activity:activity-compose:1.13.0" + ) + + implementation( + "androidx.compose.foundation:foundation" + ) + + implementation( + "androidx.compose.ui:ui" + ) + + implementation( + "androidx.compose.ui:ui-tooling-preview" + ) + + debugImplementation( + "androidx.compose.ui:ui-tooling" + ) +} diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..2f85ef1 --- /dev/null +++ b/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + diff --git a/android/app/src/main/java/com/labfytools/trainlog/MainActivity.kt b/android/app/src/main/java/com/labfytools/trainlog/MainActivity.kt new file mode 100644 index 0000000..1890355 --- /dev/null +++ b/android/app/src/main/java/com/labfytools/trainlog/MainActivity.kt @@ -0,0 +1,29 @@ +package com.labfytools.trainlog + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import com.labfytools.trainlog.data.TrainlogRepository +import com.labfytools.trainlog.ui.TrainlogApp +import com.labfytools.trainlog.ui.theme.TrainlogTheme + +class MainActivity : ComponentActivity() { + override fun onCreate( + savedInstanceState: Bundle? + ) { + super.onCreate(savedInstanceState) + + val repository = + TrainlogRepository( + applicationContext + ) + + setContent { + TrainlogTheme { + TrainlogApp( + repository = repository + ) + } + } + } +} diff --git a/android/app/src/main/java/com/labfytools/trainlog/model/BodyModels.kt b/android/app/src/main/java/com/labfytools/trainlog/model/BodyModels.kt new file mode 100644 index 0000000..48a0a37 --- /dev/null +++ b/android/app/src/main/java/com/labfytools/trainlog/model/BodyModels.kt @@ -0,0 +1,66 @@ +package com.labfytools.trainlog.model + +data class BodyObservationDraft( + val bodyWeightKg: Double? = null, + val neckCm: Double? = null, + val shouldersCm: Double? = null, + val chestCm: Double? = null, + val waistCm: Double? = null, + val hipsCm: Double? = null, + val leftArmCm: Double? = null, + val rightArmCm: Double? = null, + val leftForearmCm: Double? = null, + val rightForearmCm: Double? = null, + val leftThighCm: Double? = null, + val rightThighCm: Double? = null, + val leftCalfCm: Double? = null, + val rightCalfCm: Double? = null, +) { + fun hasAnyMetric(): Boolean = + listOf( + bodyWeightKg, + neckCm, + shouldersCm, + chestCm, + waistCm, + hipsCm, + leftArmCm, + rightArmCm, + leftForearmCm, + rightForearmCm, + leftThighCm, + rightThighCm, + leftCalfCm, + rightCalfCm, + ).any { + it != null + } + + fun allValuesPositive(): Boolean = + listOf( + bodyWeightKg, + neckCm, + shouldersCm, + chestCm, + waistCm, + hipsCm, + leftArmCm, + rightArmCm, + leftForearmCm, + rightForearmCm, + leftThighCm, + rightThighCm, + leftCalfCm, + rightCalfCm, + ).filterNotNull() + .all { + it > 0.0 + } +} + +data class BodyObservationSummary( + val observationId: String, + val observedAt: String, + val bodyWeightKg: Double?, + val metricCount: Int, +) diff --git a/android/app/src/main/java/com/labfytools/trainlog/model/ExerciseProfile.kt b/android/app/src/main/java/com/labfytools/trainlog/model/ExerciseProfile.kt new file mode 100644 index 0000000..9f5d581 --- /dev/null +++ b/android/app/src/main/java/com/labfytools/trainlog/model/ExerciseProfile.kt @@ -0,0 +1,72 @@ +package com.labfytools.trainlog.model + +enum class RecordingMode( + val wireValue: String, +) { + SETS("sets"), + CONTINUOUS("continuous"), +} + +enum class TrackingMode( + val wireValue: String, +) { + REPS("reps"), + DURATION("duration"), +} + +object ExerciseDataFields { + const val NONE: Int = 0 + const val SPEED_KMH: Int = 1 + const val DISTANCE_KM: Int = 2 + const val KNOWN_MASK: Int = + SPEED_KMH or DISTANCE_KM +} + +data class ExerciseProfile( + val exerciseId: String, + val name: String, + val normalizedName: String, + val recordingMode: RecordingMode, + val trackingMode: TrackingMode, + val dataFields: Int, +) + +data class NewExerciseProfile( + val name: String, + val recordingMode: RecordingMode, + val trackingMode: TrackingMode, + val dataFields: Int, +) { + fun validate(): Boolean { + if (name.isBlank()) { + return false + } + + if ( + dataFields and + ExerciseDataFields.KNOWN_MASK.inv() != 0 + ) { + return false + } + + if ( + recordingMode == + RecordingMode.CONTINUOUS && + trackingMode != + TrackingMode.DURATION + ) { + return false + } + + if ( + recordingMode == + RecordingMode.SETS && + dataFields != + ExerciseDataFields.NONE + ) { + return false + } + + return true + } +} diff --git a/android/app/src/main/java/com/labfytools/trainlog/model/SessionModels.kt b/android/app/src/main/java/com/labfytools/trainlog/model/SessionModels.kt new file mode 100644 index 0000000..2b6a7b2 --- /dev/null +++ b/android/app/src/main/java/com/labfytools/trainlog/model/SessionModels.kt @@ -0,0 +1,40 @@ +package com.labfytools.trainlog.model + +data class SessionSetDraft( + val reps: Int = 0, + val durationSeconds: Int = 0, +) + +data class SessionExerciseDraft( + val exercise: ExerciseProfile, + val sets: List = emptyList(), + val continuousDurationSeconds: Int = 0, + val speedKmh: Double? = null, + val distanceKm: Double? = null, +) + +data class SessionDraft( + val exercises: List, +) + +data class SessionSummary( + val sessionId: String, + val startedAt: String, + val exerciseCount: Int, +) + +data class SessionExerciseDetail( + val exerciseName: String, + val recordingMode: RecordingMode, + val trackingMode: TrackingMode, + val dataFields: Int, + val sets: List = emptyList(), + val continuousDurationSeconds: Int = 0, + val speedKmh: Double? = null, + val distanceKm: Double? = null, +) + +data class SessionDetail( + val summary: SessionSummary, + val exercises: List, +) diff --git a/android/app/src/main/java/com/labfytools/trainlog/ui/BodyScreen.kt b/android/app/src/main/java/com/labfytools/trainlog/ui/BodyScreen.kt new file mode 100644 index 0000000..93b1be2 --- /dev/null +++ b/android/app/src/main/java/com/labfytools/trainlog/ui/BodyScreen.kt @@ -0,0 +1,601 @@ +package com.labfytools.trainlog.ui + +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.text.BasicText +import androidx.compose.foundation.text.BasicTextField +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.focus.FocusManager +import androidx.compose.ui.platform.LocalFocusManager +import androidx.compose.ui.platform.LocalSoftwareKeyboardController +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.unit.dp +import com.labfytools.trainlog.data.SaveBodyObservationResult +import com.labfytools.trainlog.data.TrainlogRepository +import com.labfytools.trainlog.model.BodyObservationDraft +import com.labfytools.trainlog.ui.theme.LocalTrainlogColors +import com.labfytools.trainlog.ui.theme.TrainlogTypography + +@Composable +fun BodyScreen( + repository: TrainlogRepository, + onBack: () -> Unit, +) { + val colors = + LocalTrainlogColors.current + + val focusManager = + LocalFocusManager.current + + val keyboardController = + LocalSoftwareKeyboardController.current + + var bodyWeight by + remember { + mutableStateOf("") + } + + var neck by + remember { + mutableStateOf("") + } + + var shoulders by + remember { + mutableStateOf("") + } + + var chest by + remember { + mutableStateOf("") + } + + var waist by + remember { + mutableStateOf("") + } + + var hips by + remember { + mutableStateOf("") + } + + var leftArm by + remember { + mutableStateOf("") + } + + var rightArm by + remember { + mutableStateOf("") + } + + var leftForearm by + remember { + mutableStateOf("") + } + + var rightForearm by + remember { + mutableStateOf("") + } + + var leftThigh by + remember { + mutableStateOf("") + } + + var rightThigh by + remember { + mutableStateOf("") + } + + var leftCalf by + remember { + mutableStateOf("") + } + + var rightCalf by + remember { + mutableStateOf("") + } + + var message by + remember { + mutableStateOf( + null + ) + } + + var revision by + remember { + mutableIntStateOf(0) + } + + val recent = + remember(revision) { + repository + .listBodyObservations( + limit = 5 + ) + } + + fun clearForm() { + bodyWeight = "" + neck = "" + shoulders = "" + chest = "" + waist = "" + hips = "" + leftArm = "" + rightArm = "" + leftForearm = "" + rightForearm = "" + leftThigh = "" + rightThigh = "" + leftCalf = "" + rightCalf = "" + } + + TrainlogScreen( + subtitle = "M E N S U R A T I O N S" + ) { + TrainlogAction( + label = "< Retour", + description = + "Revenir à l'accueil.", + onClick = onBack, + accent = colors.muted, + ) + + TrainlogFrame( + title = "GENERAL" + ) { + BodyMetricField( + label = "Poids", + unit = "kg", + value = bodyWeight, + onValueChange = { + bodyWeight = it + message = null + }, + ) + + BodyMetricField( + label = "Cou", + unit = "cm", + value = neck, + onValueChange = { + neck = it + message = null + }, + ) + + BodyMetricField( + label = "Épaules", + unit = "cm", + value = shoulders, + onValueChange = { + shoulders = it + message = null + }, + ) + + BodyMetricField( + label = "Poitrine", + unit = "cm", + value = chest, + onValueChange = { + chest = it + message = null + }, + ) + + BodyMetricField( + label = "Tour de taille", + unit = "cm", + value = waist, + onValueChange = { + waist = it + message = null + }, + ) + + BodyMetricField( + label = "Hanches", + unit = "cm", + value = hips, + onValueChange = { + hips = it + message = null + }, + ) + } + + TrainlogFrame( + title = "MEMBRES" + ) { + BodyMetricField( + label = "Bras gauche", + unit = "cm", + value = leftArm, + onValueChange = { + leftArm = it + message = null + }, + ) + + BodyMetricField( + label = "Bras droit", + unit = "cm", + value = rightArm, + onValueChange = { + rightArm = it + message = null + }, + ) + + BodyMetricField( + label = "Avant-bras gauche", + unit = "cm", + value = leftForearm, + onValueChange = { + leftForearm = it + message = null + }, + ) + + BodyMetricField( + label = "Avant-bras droit", + unit = "cm", + value = rightForearm, + onValueChange = { + rightForearm = it + message = null + }, + ) + + BodyMetricField( + label = "Cuisse gauche", + unit = "cm", + value = leftThigh, + onValueChange = { + leftThigh = it + message = null + }, + ) + + BodyMetricField( + label = "Cuisse droite", + unit = "cm", + value = rightThigh, + onValueChange = { + rightThigh = it + message = null + }, + ) + + BodyMetricField( + label = "Mollet gauche", + unit = "cm", + value = leftCalf, + onValueChange = { + leftCalf = it + message = null + }, + ) + + BodyMetricField( + label = "Mollet droit", + unit = "cm", + value = rightCalf, + onValueChange = { + rightCalf = it + message = null + }, + ) + } + + TrainlogFrame( + title = "ENREGISTREMENT" + ) { + TrainlogAction( + label = + "Enregistrer les mensurations", + description = + "Les champs vides sont ignorés.", + accent = + colors.success, + onClick = { + focusManager.clearFocus( + force = true + ) + + keyboardController?.hide() + + val values = + listOf( + bodyWeight, + neck, + shoulders, + chest, + waist, + hips, + leftArm, + rightArm, + leftForearm, + rightForearm, + leftThigh, + rightThigh, + leftCalf, + rightCalf, + ) + + val parsed = + values.map { + parseOptionalMetric( + it + ) + } + + if ( + parsed.any { + it is MetricParse.Invalid + } + ) { + message = + "Une valeur est invalide." + } else { + val doubles = + parsed.map { + when (it) { + is MetricParse.Value -> + it.value + + MetricParse.Empty -> + null + + MetricParse.Invalid -> + null + } + } + + val draft = + BodyObservationDraft( + bodyWeightKg = + doubles[0], + neckCm = + doubles[1], + shouldersCm = + doubles[2], + chestCm = + doubles[3], + waistCm = + doubles[4], + hipsCm = + doubles[5], + leftArmCm = + doubles[6], + rightArmCm = + doubles[7], + leftForearmCm = + doubles[8], + rightForearmCm = + doubles[9], + leftThighCm = + doubles[10], + rightThighCm = + doubles[11], + leftCalfCm = + doubles[12], + rightCalfCm = + doubles[13], + ) + + when ( + repository + .saveBodyObservation( + draft + ) + ) { + is SaveBodyObservationResult.Saved -> { + clearForm() + revision += 1 + message = + "Mensurations enregistrées." + } + + SaveBodyObservationResult.Invalid -> { + message = + "Ajoutez au moins une mesure positive." + } + + SaveBodyObservationResult.DatabaseError -> { + message = + "Erreur base locale." + } + } + } + }, + ) + + if ( + message != null + ) { + TrainlogInfo( + text = + message.orEmpty(), + color = + if ( + message == + "Mensurations enregistrées." + ) { + colors.success + } else { + colors.error + }, + ) + } + } + + TrainlogFrame( + title = "DERNIERS RELEVES", + active = + recent.isNotEmpty(), + ) { + if (recent.isEmpty()) { + TrainlogInfo( + "Aucun relevé enregistré." + ) + } else { + recent.forEach { + item -> + + TrainlogInfo( + text = + buildString { + append( + formatStartedAt( + item.observedAt + ) + ) + + append( + " · ${item.metricCount} mesure(s)" + ) + + item.bodyWeightKg + ?.let { + append( + " · %.1f kg" + .format(it) + ) + } + }, + color = + colors.text, + ) + } + } + } + } +} + +@Composable +private fun BodyMetricField( + label: String, + unit: String, + value: String, + onValueChange: (String) -> Unit, +) { + val colors = + LocalTrainlogColors.current + + Column( + modifier = + Modifier.padding( + bottom = 11.dp + ) + ) { + BasicText( + text = + "$label ($unit)" + .uppercase(), + modifier = + Modifier.padding( + bottom = 5.dp + ), + style = + TrainlogTypography.small + .copy( + color = + colors.muted, + ), + ) + + BasicTextField( + value = value, + onValueChange = + onValueChange, + singleLine = true, + keyboardOptions = + KeyboardOptions( + keyboardType = + KeyboardType.Decimal, + imeAction = + ImeAction.Next, + ), + cursorBrush = + SolidColor( + colors.accent + ), + textStyle = + TrainlogTypography.normal + .copy( + color = + colors.text, + ), + modifier = + Modifier + .fillMaxWidth() + .border( + width = 1.dp, + color = + colors.surfaceAlt, + ) + .background( + colors.surface + ) + .padding(12.dp), + ) + } +} + +private sealed interface MetricParse { + data object Empty : + MetricParse + + data object Invalid : + MetricParse + + data class Value( + val value: Double, + ) : MetricParse +} + +private fun parseOptionalMetric( + text: String, +): MetricParse { + if (text.isBlank()) { + return MetricParse.Empty + } + + val value = + text.trim() + .replace( + ',', + '.' + ) + .toDoubleOrNull() + ?: return MetricParse.Invalid + + return if (value > 0.0) { + MetricParse.Value( + value + ) + } else { + MetricParse.Invalid + } +} diff --git a/android/app/src/main/java/com/labfytools/trainlog/ui/ExerciseScreen.kt b/android/app/src/main/java/com/labfytools/trainlog/ui/ExerciseScreen.kt new file mode 100644 index 0000000..da6d63a --- /dev/null +++ b/android/app/src/main/java/com/labfytools/trainlog/ui/ExerciseScreen.kt @@ -0,0 +1,487 @@ +package com.labfytools.trainlog.ui + +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.text.BasicText +import androidx.compose.foundation.text.BasicTextField +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.unit.dp +import com.labfytools.trainlog.data.CreateExerciseResult +import com.labfytools.trainlog.data.TrainlogRepository +import com.labfytools.trainlog.model.ExerciseDataFields +import com.labfytools.trainlog.model.NewExerciseProfile +import com.labfytools.trainlog.model.RecordingMode +import com.labfytools.trainlog.model.TrackingMode +import com.labfytools.trainlog.ui.theme.LocalTrainlogColors +import com.labfytools.trainlog.ui.theme.TrainlogTypography + +@Composable +fun ExerciseScreen( + repository: TrainlogRepository, + inline: Boolean, + onBack: () -> Unit, + onSaved: () -> Unit, +) { + val colors = + LocalTrainlogColors.current + + var name by + remember { + mutableStateOf("") + } + + var recordingMode by + remember { + mutableStateOf( + RecordingMode.SETS + ) + } + + var trackingMode by + remember { + mutableStateOf( + TrackingMode.REPS + ) + } + + var speed by + remember { + mutableStateOf(false) + } + + var distance by + remember { + mutableStateOf(false) + } + + var message by + remember { + mutableStateOf( + null + ) + } + + TrainlogScreen( + subtitle = "E X E R C I C E" + ) { + TrainlogAction( + label = + if (inline) { + "< Retour à la séance" + } else { + "< Retour" + }, + description = + if (inline) { + "Retourner dans la séance en cours." + } else { + "Revenir à l'accueil." + }, + onClick = onBack, + accent = colors.muted, + ) + + TrainlogFrame( + title = "NOUVEL EXERCICE" + ) { + TrainlogField( + label = "Nom", + value = name, + onValueChange = { + name = it + message = null + }, + ) + + TrainlogChoiceGroup( + label = "Organisation", + ) { + TrainlogChoice( + label = "Séries", + selected = + recordingMode == + RecordingMode.SETS, + onClick = { + recordingMode = + RecordingMode.SETS + + speed = false + distance = false + message = null + }, + ) + + TrainlogChoice( + label = "Continu", + selected = + recordingMode == + RecordingMode.CONTINUOUS, + onClick = { + recordingMode = + RecordingMode.CONTINUOUS + + trackingMode = + TrackingMode.DURATION + + message = null + }, + ) + } + + TrainlogChoiceGroup( + label = "Mesure principale", + ) { + if ( + recordingMode == + RecordingMode.SETS + ) { + TrainlogChoice( + label = + "Répétitions", + selected = + trackingMode == + TrackingMode.REPS, + onClick = { + trackingMode = + TrackingMode.REPS + + message = null + }, + ) + } + + TrainlogChoice( + label = "Durée", + selected = + trackingMode == + TrackingMode.DURATION, + onClick = { + trackingMode = + TrackingMode.DURATION + + message = null + }, + ) + } + + if ( + recordingMode == + RecordingMode.CONTINUOUS + ) { + TrainlogChoiceGroup( + label = + "Données complémentaires", + ) { + TrainlogChoice( + label = "Vitesse", + selected = speed, + onClick = { + speed = !speed + message = null + }, + ) + + TrainlogChoice( + label = "Distance", + selected = distance, + onClick = { + distance = + !distance + + message = null + }, + ) + } + } + + val fields = + if ( + recordingMode == + RecordingMode.CONTINUOUS + ) { + ( + if (speed) { + ExerciseDataFields + .SPEED_KMH + } else { + ExerciseDataFields + .NONE + } + ) or + ( + if (distance) { + ExerciseDataFields + .DISTANCE_KM + } else { + ExerciseDataFields + .NONE + } + ) + } else { + ExerciseDataFields.NONE + } + + TrainlogInfo( + text = + profilePreview( + recordingMode, + trackingMode, + fields, + ), + color = colors.accent, + ) + + TrainlogAction( + label = + if (inline) { + "Créer et revenir à la séance" + } else { + "Enregistrer l'exercice" + }, + description = + "Ajouter ce profil au catalogue local.", + accent = + colors.success, + onClick = { + when ( + repository.createExercise( + NewExerciseProfile( + name = name, + recordingMode = + recordingMode, + trackingMode = + trackingMode, + dataFields = + fields, + ) + ) + ) { + is CreateExerciseResult.Created -> { + message = null + onSaved() + } + + CreateExerciseResult.Conflict -> { + message = + "Un exercice portant ce nom existe déjà." + } + + CreateExerciseResult.Invalid -> { + message = + "Profil ou nom invalide." + } + } + }, + ) + + if (message != null) { + TrainlogInfo( + text = + message.orEmpty(), + color = colors.error, + ) + } + } + + TrainlogFrame( + title = "CONTRAT", + active = false, + ) { + TrainlogInfo( + "CONTINUOUS force DURATION." + ) + + TrainlogInfo( + "Aucune règle ne dépend du nom." + ) + } + } +} + +@Composable +private fun TrainlogField( + label: String, + value: String, + onValueChange: (String) -> Unit, +) { + val colors = + LocalTrainlogColors.current + + Column( + modifier = + Modifier.padding( + bottom = 14.dp + ) + ) { + BasicText( + text = label.uppercase(), + modifier = + Modifier.padding( + bottom = 6.dp + ), + style = + TrainlogTypography.small.copy( + color = colors.muted, + ), + ) + + BasicTextField( + value = value, + onValueChange = onValueChange, + singleLine = true, + cursorBrush = + SolidColor( + colors.accent + ), + textStyle = + TrainlogTypography.normal + .copy( + color = colors.text + ), + modifier = + Modifier + .fillMaxWidth() + .border( + width = 1.dp, + color = + colors.surfaceAlt, + ) + .background( + colors.surface + ) + .padding(12.dp), + ) + } +} + +@Composable +private fun TrainlogChoiceGroup( + label: String, + content: @Composable () -> Unit, +) { + val colors = + LocalTrainlogColors.current + + Column( + modifier = + Modifier.padding( + bottom = 14.dp + ) + ) { + BasicText( + text = label.uppercase(), + modifier = + Modifier.padding( + bottom = 5.dp + ), + style = + TrainlogTypography.small.copy( + color = colors.muted, + ), + ) + + content() + } +} + +@Composable +private fun TrainlogChoice( + label: String, + selected: Boolean, + onClick: () -> Unit, +) { + val colors = + LocalTrainlogColors.current + + Row( + modifier = + Modifier + .fillMaxWidth() + .padding( + vertical = 3.dp + ) + .border( + width = 1.dp, + color = + if (selected) { + colors.warning + } else { + colors.surfaceAlt + }, + ) + .background( + if (selected) { + colors.surfaceAlt + } else { + colors.surface + } + ) + .clickable( + onClick = onClick + ) + .padding(11.dp) + ) { + BasicText( + text = + if (selected) { + "[X] $label" + } else { + "[ ] $label" + }, + style = + TrainlogTypography.normal.copy( + color = + if (selected) { + colors.warning + } else { + colors.text + }, + ), + ) + } +} + +private fun profilePreview( + recordingMode: RecordingMode, + trackingMode: TrackingMode, + dataFields: Int, +): String { + val extras = + buildList { + if ( + dataFields and + ExerciseDataFields.SPEED_KMH != 0 + ) { + add("VITESSE") + } + + if ( + dataFields and + ExerciseDataFields.DISTANCE_KM != 0 + ) { + add("DISTANCE") + } + } + + return buildString { + append(recordingMode.name) + append(" + ") + append(trackingMode.name) + + for (extra in extras) { + append(" + ") + append(extra) + } + } +} diff --git a/android/app/src/main/java/com/labfytools/trainlog/ui/HistoryScreen.kt b/android/app/src/main/java/com/labfytools/trainlog/ui/HistoryScreen.kt new file mode 100644 index 0000000..7f1be59 --- /dev/null +++ b/android/app/src/main/java/com/labfytools/trainlog/ui/HistoryScreen.kt @@ -0,0 +1,74 @@ +package com.labfytools.trainlog.ui + +import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember +import com.labfytools.trainlog.data.TrainlogRepository +import com.labfytools.trainlog.ui.theme.LocalTrainlogColors + +@Composable +fun HistoryScreen( + repository: TrainlogRepository, + onBack: () -> Unit, + onOpenSession: (String) -> Unit, +) { + val colors = + LocalTrainlogColors.current + + val sessions = + remember { + repository.listSessions() + } + + TrainlogScreen( + subtitle = "H I S T O R I Q U E" + ) { + TrainlogAction( + label = "< Retour", + description = + "Revenir à l'accueil.", + onClick = onBack, + accent = colors.muted, + ) + + TrainlogFrame( + title = "SEANCES", + active = + sessions.isNotEmpty(), + ) { + if (sessions.isEmpty()) { + TrainlogInfo( + "Aucune séance enregistrée." + ) + } else { + sessions.forEach { + session -> + + TrainlogAction( + label = + formatStartedAt( + session.startedAt + ), + description = + "${session.exerciseCount} exercice(s)", + onClick = { + onOpenSession( + session.sessionId + ) + }, + ) + } + } + } + } +} + +internal fun formatStartedAt( + value: String, +): String { + return value + .replace( + 'T', + ' ' + ) + .take(16) +} diff --git a/android/app/src/main/java/com/labfytools/trainlog/ui/HomeScreen.kt b/android/app/src/main/java/com/labfytools/trainlog/ui/HomeScreen.kt new file mode 100644 index 0000000..2de7c76 --- /dev/null +++ b/android/app/src/main/java/com/labfytools/trainlog/ui/HomeScreen.kt @@ -0,0 +1,68 @@ +package com.labfytools.trainlog.ui + +import androidx.compose.runtime.Composable + +@Composable +fun HomeScreen( + onSession: () -> Unit, + onExercise: () -> Unit, + onBody: () -> Unit, + onHistory: () -> Unit, +) { + TrainlogScreen( + subtitle = "A C C U E I L" + ) { + TrainlogFrame( + title = "ENREGISTREMENT" + ) { + TrainlogAction( + label = + "Enregistrer une séance", + description = + "Saisir un entraînement et ses exercices.", + onClick = onSession, + ) + + TrainlogAction( + label = + "Enregistrer un exercice", + description = + "Créer une entrée dans le catalogue Trainlog.", + onClick = onExercise, + ) + + TrainlogAction( + label = + "Enregistrer des mensurations", + description = + "Ajouter un relevé corporel.", + onClick = onBody, + ) + } + + TrainlogFrame( + title = "CONSULTATION" + ) { + TrainlogAction( + label = + "Historique des séances", + description = + "Consulter les séances enregistrées et leur détail.", + onClick = onHistory, + ) + } + + TrainlogFrame( + title = "STATUT", + active = false, + ) { + TrainlogInfo( + "Stockage Android local actif." + ) + + TrainlogInfo( + "Synchronisation MTP : après les workflows locaux." + ) + } + } +} diff --git a/android/app/src/main/java/com/labfytools/trainlog/ui/SessionDetailScreen.kt b/android/app/src/main/java/com/labfytools/trainlog/ui/SessionDetailScreen.kt new file mode 100644 index 0000000..6e750b0 --- /dev/null +++ b/android/app/src/main/java/com/labfytools/trainlog/ui/SessionDetailScreen.kt @@ -0,0 +1,186 @@ +package com.labfytools.trainlog.ui + +import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember +import com.labfytools.trainlog.data.TrainlogRepository +import com.labfytools.trainlog.model.ExerciseDataFields +import com.labfytools.trainlog.model.RecordingMode +import com.labfytools.trainlog.model.SessionExerciseDetail +import com.labfytools.trainlog.model.TrackingMode +import com.labfytools.trainlog.ui.theme.LocalTrainlogColors + +@Composable +fun SessionDetailScreen( + repository: TrainlogRepository, + sessionId: String?, + onBack: () -> Unit, +) { + val colors = + LocalTrainlogColors.current + + val detail = + remember(sessionId) { + sessionId?.let { + repository.getSessionDetail( + it + ) + } + } + + TrainlogScreen( + subtitle = "D E T A I L S E A N C E" + ) { + TrainlogAction( + label = + "< Retour à l'historique", + description = + "Revenir à la liste des séances.", + onClick = onBack, + accent = colors.muted, + ) + + if (detail == null) { + TrainlogFrame( + title = "ERREUR" + ) { + TrainlogInfo( + text = + "Séance introuvable.", + color = + colors.error, + ) + } + + return@TrainlogScreen + } + + TrainlogFrame( + title = "SEANCE" + ) { + TrainlogInfo( + formatStartedAt( + detail.summary.startedAt + ) + ) + + TrainlogInfo( + "${detail.summary.exerciseCount} exercice(s)" + ) + } + + detail.exercises + .forEachIndexed { + index, + exercise -> + + TrainlogFrame( + title = + "${index + 1}. ${exercise.exerciseName}" + ) { + if ( + exercise.recordingMode == + RecordingMode.CONTINUOUS + ) { + ContinuousDetail( + exercise + ) + } else { + SetsDetail( + exercise + ) + } + } + } + } +} + +@Composable +private fun SetsDetail( + exercise: SessionExerciseDetail, +) { + val colors = + LocalTrainlogColors.current + + TrainlogInfo( + text = + if ( + exercise.trackingMode == + TrackingMode.REPS + ) { + "Mode : séries · répétitions" + } else { + "Mode : séries · durée" + }, + color = colors.accent, + ) + + exercise.sets + .forEachIndexed { + index, + set -> + + TrainlogInfo( + if ( + exercise.trackingMode == + TrackingMode.REPS + ) { + "Série ${index + 1} : ${set.reps} reps" + } else { + "Série ${index + 1} : ${formatDuration(set.durationSeconds)}" + } + ) + } +} + +@Composable +private fun ContinuousDetail( + exercise: SessionExerciseDetail, +) { + val colors = + LocalTrainlogColors.current + + TrainlogInfo( + text = + "Mode : continu", + color = colors.accent, + ) + + TrainlogInfo( + "Durée : ${formatDuration(exercise.continuousDurationSeconds)}" + ) + + if ( + exercise.dataFields and + ExerciseDataFields.SPEED_KMH != 0 + ) { + TrainlogInfo( + "Vitesse : %.1f km/h".format( + exercise.speedKmh ?: 0.0 + ) + ) + } + + if ( + exercise.dataFields and + ExerciseDataFields.DISTANCE_KM != 0 + ) { + TrainlogInfo( + "Distance : %.2f km".format( + exercise.distanceKm ?: 0.0 + ) + ) + } +} + +private fun formatDuration( + seconds: Int, +): String { + if ( + seconds > 0 && + seconds % 60 == 0 + ) { + return "${seconds / 60} min" + } + + return "$seconds s" +} diff --git a/android/app/src/main/java/com/labfytools/trainlog/ui/SessionScreen.kt b/android/app/src/main/java/com/labfytools/trainlog/ui/SessionScreen.kt new file mode 100644 index 0000000..bcd0e8a --- /dev/null +++ b/android/app/src/main/java/com/labfytools/trainlog/ui/SessionScreen.kt @@ -0,0 +1,879 @@ +package com.labfytools.trainlog.ui + +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.text.BasicText +import androidx.compose.foundation.text.BasicTextField +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.unit.dp +import com.labfytools.trainlog.data.SaveSessionResult +import com.labfytools.trainlog.data.TrainlogRepository +import com.labfytools.trainlog.model.ExerciseDataFields +import com.labfytools.trainlog.model.ExerciseProfile +import com.labfytools.trainlog.model.RecordingMode +import com.labfytools.trainlog.model.SessionDraft +import com.labfytools.trainlog.model.SessionExerciseDraft +import com.labfytools.trainlog.model.SessionSetDraft +import com.labfytools.trainlog.model.TrackingMode +import com.labfytools.trainlog.ui.theme.LocalTrainlogColors +import com.labfytools.trainlog.ui.theme.TrainlogTypography + +@Composable +fun SessionScreen( + repository: TrainlogRepository, + catalogRevision: Int, + onBack: () -> Unit, + onCreateExercise: () -> Unit, +) { + val colors = + LocalTrainlogColors.current + + val exercises = + remember( + catalogRevision + ) { + repository.listExercises() + } + + var selectedExercise by + remember( + catalogRevision + ) { + mutableStateOf< + ExerciseProfile? + >(null) + } + + var draftExercises by + remember { + mutableStateOf( + emptyList< + SessionExerciseDraft + >() + ) + } + + var sessionRevision by + remember { + mutableIntStateOf(0) + } + + var message by + remember { + mutableStateOf< + String? + >(null) + } + + TrainlogScreen( + subtitle = "S E A N C E" + ) { + TrainlogAction( + label = "< Retour", + description = + "Revenir à l'accueil.", + onClick = onBack, + accent = colors.muted, + ) + + TrainlogFrame( + title = "SEANCE EN COURS" + ) { + if ( + draftExercises.isEmpty() + ) { + TrainlogInfo( + "Aucun exercice ajouté." + ) + } else { + draftExercises + .forEachIndexed { + index, + draft -> + + TrainlogInfo( + text = + "${index + 1}. " + + draftSummary( + draft + ), + color = + colors.text, + ) + } + } + } + + TrainlogFrame( + title = "CATALOGUE", + active = + exercises.isNotEmpty(), + ) { + if ( + exercises.isEmpty() + ) { + TrainlogInfo( + "Aucun exercice." + ) + } else { + exercises.forEach { + exercise -> + + val alreadyAdded = + draftExercises.any { + it.exercise.exerciseId == + exercise.exerciseId + } + + CatalogChoice( + exercise = + exercise, + selected = + selectedExercise + ?.exerciseId == + exercise.exerciseId, + disabled = + alreadyAdded, + onClick = { + if ( + !alreadyAdded + ) { + selectedExercise = + exercise + + message = null + } + }, + ) + } + } + } + + if ( + selectedExercise != null + ) { + SessionExerciseForm( + key = + selectedExercise!! + .exerciseId, + exercise = + selectedExercise!!, + onCancel = { + selectedExercise = + null + }, + onAdd = { + draft -> + draftExercises = + draftExercises + + draft + + selectedExercise = + null + + sessionRevision += 1 + + message = + "Exercice ajouté à la séance." + }, + ) + } + + TrainlogFrame( + title = "EXERCICES" + ) { + TrainlogAction( + label = + "Créer un nouvel exercice", + description = + "Créer l'exercice sans quitter la saisie de séance.", + onClick = + onCreateExercise, + accent = + colors.success, + ) + } + + TrainlogFrame( + title = "ENREGISTREMENT", + active = + draftExercises.isNotEmpty(), + ) { + TrainlogAction( + label = + "Enregistrer la séance", + description = + "${draftExercises.size} exercice(s) dans la séance.", + accent = + colors.success, + onClick = { + when ( + val result = + repository + .saveSession( + SessionDraft( + exercises = + draftExercises + ) + ) + ) { + is SaveSessionResult.Saved -> { + draftExercises = + emptyList() + + selectedExercise = + null + + sessionRevision += 1 + + message = + "Séance enregistrée." + } + + SaveSessionResult.Invalid -> { + message = + "Séance invalide." + } + + SaveSessionResult.DatabaseError -> { + message = + "Erreur base locale." + } + } + }, + ) + + if ( + message != null + ) { + TrainlogInfo( + text = + message.orEmpty(), + color = + if ( + message == + "Séance enregistrée." || + message == + "Exercice ajouté à la séance." + ) { + colors.success + } else { + colors.error + }, + ) + } + } + } +} + +@Composable +private fun CatalogChoice( + exercise: ExerciseProfile, + selected: Boolean, + disabled: Boolean, + onClick: () -> Unit, +) { + val colors = + LocalTrainlogColors.current + + val profile = + exerciseProfileLabel( + exercise + ) + + Row( + modifier = + Modifier + .fillMaxWidth() + .padding( + vertical = 3.dp + ) + .border( + width = 1.dp, + color = + when { + selected -> + colors.warning + + disabled -> + colors.muted + + else -> + colors.surfaceAlt + }, + ) + .background( + if (selected) { + colors.surfaceAlt + } else { + colors.surface + } + ) + .clickable( + enabled = + !disabled, + onClick = + onClick, + ) + .padding(11.dp) + ) { + BasicText( + text = + ( + if (disabled) { + "[✓] " + } else if (selected) { + "[>] " + } else { + "[ ] " + } + ) + + exercise.name + + " [$profile]", + style = + TrainlogTypography.normal + .copy( + color = + if (disabled) { + colors.muted + } else if ( + selected + ) { + colors.warning + } else { + colors.text + }, + ), + ) + } +} + +@Composable +private fun SessionExerciseForm( + key: String, + exercise: ExerciseProfile, + onCancel: () -> Unit, + onAdd: + (SessionExerciseDraft) -> + Unit, +) { + val colors = + LocalTrainlogColors.current + + var setCountText by + remember(key) { + mutableStateOf("3") + } + + var repsText by + remember(key) { + mutableStateOf("10") + } + + var durationText by + remember(key) { + mutableStateOf("30") + } + + var speedText by + remember(key) { + mutableStateOf("") + } + + var distanceText by + remember(key) { + mutableStateOf("") + } + + var error by + remember(key) { + mutableStateOf< + String? + >(null) + } + + TrainlogFrame( + title = + "SAISIE — ${exercise.name}" + ) { + TrainlogInfo( + text = + exerciseProfileLabel( + exercise + ), + color = colors.accent, + ) + + if ( + exercise.recordingMode == + RecordingMode.SETS + ) { + SessionNumberField( + label = + "Nombre de séries", + value = + setCountText, + onValueChange = { + setCountText = it + error = null + }, + ) + + if ( + exercise.trackingMode == + TrackingMode.REPS + ) { + SessionNumberField( + label = + "Répétitions par série", + value = + repsText, + onValueChange = { + repsText = it + error = null + }, + ) + } else { + SessionNumberField( + label = + "Durée par série (secondes)", + value = + durationText, + onValueChange = { + durationText = it + error = null + }, + ) + } + } else { + SessionNumberField( + label = + "Durée (minutes)", + value = + durationText, + onValueChange = { + durationText = it + error = null + }, + ) + + if ( + exercise.dataFields and + ExerciseDataFields + .SPEED_KMH != 0 + ) { + SessionNumberField( + label = + "Vitesse km/h", + value = + speedText, + onValueChange = { + speedText = it + error = null + }, + ) + } + + if ( + exercise.dataFields and + ExerciseDataFields + .DISTANCE_KM != 0 + ) { + SessionNumberField( + label = + "Distance km", + value = + distanceText, + onValueChange = { + distanceText = it + error = null + }, + ) + } + } + + TrainlogAction( + label = + "Ajouter à la séance", + description = + "Ajouter cette saisie au brouillon.", + accent = + colors.success, + onClick = { + val draft = + buildSessionExerciseDraft( + exercise = + exercise, + setCountText = + setCountText, + repsText = + repsText, + durationText = + durationText, + speedText = + speedText, + distanceText = + distanceText, + ) + + if (draft == null) { + error = + "Valeurs invalides." + } else { + onAdd(draft) + } + }, + ) + + TrainlogAction( + label = + "Annuler la saisie", + description = + "Revenir au catalogue.", + accent = + colors.muted, + onClick = + onCancel, + ) + + if ( + error != null + ) { + TrainlogInfo( + text = + error.orEmpty(), + color = colors.error, + ) + } + } +} + +@Composable +private fun SessionNumberField( + label: String, + value: String, + onValueChange: (String) -> Unit, +) { + val colors = + LocalTrainlogColors.current + + Column( + modifier = + Modifier.padding( + bottom = 12.dp + ) + ) { + BasicText( + text = + label.uppercase(), + modifier = + Modifier.padding( + bottom = 5.dp + ), + style = + TrainlogTypography.small + .copy( + color = + colors.muted, + ), + ) + + BasicTextField( + value = value, + onValueChange = + onValueChange, + singleLine = true, + cursorBrush = + SolidColor( + colors.accent + ), + textStyle = + TrainlogTypography.normal + .copy( + color = + colors.text, + ), + modifier = + Modifier + .fillMaxWidth() + .border( + width = 1.dp, + color = + colors.surfaceAlt, + ) + .background( + colors.surface + ) + .padding(12.dp), + ) + } +} + +private fun buildSessionExerciseDraft( + exercise: ExerciseProfile, + setCountText: String, + repsText: String, + durationText: String, + speedText: String, + distanceText: String, +): SessionExerciseDraft? { + return if ( + exercise.recordingMode == + RecordingMode.CONTINUOUS + ) { + val minutes = + durationText + .toIntOrNull() + + if ( + minutes == null || + minutes <= 0 || + minutes > 1440 + ) { + null + } else { + val wantsSpeed = + exercise.dataFields and + ExerciseDataFields + .SPEED_KMH != 0 + + val wantsDistance = + exercise.dataFields and + ExerciseDataFields + .DISTANCE_KM != 0 + + val speed = + if (wantsSpeed) { + speedText + .replace( + ',', + '.' + ) + .toDoubleOrNull() + } else { + null + } + + val distance = + if ( + wantsDistance + ) { + distanceText + .replace( + ',', + '.' + ) + .toDoubleOrNull() + } else { + null + } + + if ( + ( + wantsSpeed && + ( + speed == null || + speed <= 0.0 + ) + ) || + ( + wantsDistance && + ( + distance == null || + distance <= 0.0 + ) + ) + ) { + null + } else { + SessionExerciseDraft( + exercise = + exercise, + continuousDurationSeconds = + minutes * 60, + speedKmh = + speed, + distanceKm = + distance, + ) + } + } + } else { + val count = + setCountText + .toIntOrNull() + + if ( + count == null || + count <= 0 || + count > 64 + ) { + null + } else if ( + exercise.trackingMode == + TrackingMode.REPS + ) { + val reps = + repsText + .toIntOrNull() + + if ( + reps == null || + reps < 0 || + reps > 10000 + ) { + null + } else { + SessionExerciseDraft( + exercise = + exercise, + sets = + List(count) { + SessionSetDraft( + reps = reps + ) + }, + ) + } + } else { + val seconds = + durationText + .toIntOrNull() + + if ( + seconds == null || + seconds <= 0 || + seconds > 86400 + ) { + null + } else { + SessionExerciseDraft( + exercise = + exercise, + sets = + List(count) { + SessionSetDraft( + durationSeconds = + seconds + ) + }, + ) + } + } + } +} + +private fun draftSummary( + draft: + SessionExerciseDraft, +): String { + val exercise = + draft.exercise + + return if ( + exercise.recordingMode == + RecordingMode.CONTINUOUS + ) { + buildString { + append( + exercise.name + ) + + append(" · ") + + append( + draft + .continuousDurationSeconds / + 60 + ) + + append(" min") + + draft.speedKmh + ?.let { + append( + " · %.1f km/h" + .format(it) + ) + } + + draft.distanceKm + ?.let { + append( + " · %.2f km" + .format(it) + ) + } + } + } else { + val metric = + if ( + exercise.trackingMode == + TrackingMode.REPS + ) { + "${draft.sets.firstOrNull()?.reps ?: 0} reps" + } else { + "${draft.sets.firstOrNull()?.durationSeconds ?: 0} s" + } + + "${exercise.name} · ${draft.sets.size} × $metric" + } +} + +private fun exerciseProfileLabel( + exercise: ExerciseProfile, +): String { + return buildString { + append( + if ( + exercise.recordingMode == + RecordingMode.CONTINUOUS + ) { + "CONTINU" + } else { + "SERIES" + } + ) + + append(" · ") + + append( + if ( + exercise.trackingMode == + TrackingMode.REPS + ) { + "REPS" + } else { + "DUREE" + } + ) + + if ( + exercise.dataFields and + ExerciseDataFields + .SPEED_KMH != 0 + ) { + append(" · VITESSE") + } + + if ( + exercise.dataFields and + ExerciseDataFields + .DISTANCE_KM != 0 + ) { + append(" · DISTANCE") + } + } +} diff --git a/android/app/src/main/java/com/labfytools/trainlog/ui/TrainlogApp.kt b/android/app/src/main/java/com/labfytools/trainlog/ui/TrainlogApp.kt new file mode 100644 index 0000000..cd57cab --- /dev/null +++ b/android/app/src/main/java/com/labfytools/trainlog/ui/TrainlogApp.kt @@ -0,0 +1,167 @@ +package com.labfytools.trainlog.ui + +import androidx.activity.compose.BackHandler +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import com.labfytools.trainlog.data.TrainlogRepository + +private enum class TrainlogScreenId { + HOME, + SESSION, + EXERCISE, + BODY, + HISTORY, + SESSION_DETAIL, +} + +@Composable +fun TrainlogApp( + repository: TrainlogRepository, +) { + var screen by + remember { + mutableStateOf( + TrainlogScreenId.HOME + ) + } + + var exerciseReturnTarget by + remember { + mutableStateOf( + TrainlogScreenId.HOME + ) + } + + var catalogRevision by + remember { + mutableIntStateOf(0) + } + + var selectedSessionId by + remember { + mutableStateOf( + null + ) + } + + if ( + screen != + TrainlogScreenId.HOME + ) { + BackHandler { + screen = + when (screen) { + TrainlogScreenId.EXERCISE -> + exerciseReturnTarget + + TrainlogScreenId.SESSION_DETAIL -> + TrainlogScreenId.HISTORY + + else -> + TrainlogScreenId.HOME + } + } + } + + when (screen) { + TrainlogScreenId.HOME -> + HomeScreen( + onSession = { + screen = + TrainlogScreenId.SESSION + }, + onExercise = { + exerciseReturnTarget = + TrainlogScreenId.HOME + + screen = + TrainlogScreenId.EXERCISE + }, + onBody = { + screen = + TrainlogScreenId.BODY + }, + onHistory = { + screen = + TrainlogScreenId.HISTORY + }, + ) + + TrainlogScreenId.SESSION -> + SessionScreen( + repository = repository, + catalogRevision = + catalogRevision, + onBack = { + screen = + TrainlogScreenId.HOME + }, + onCreateExercise = { + exerciseReturnTarget = + TrainlogScreenId.SESSION + + screen = + TrainlogScreenId.EXERCISE + }, + ) + + TrainlogScreenId.EXERCISE -> + ExerciseScreen( + repository = repository, + inline = + exerciseReturnTarget == + TrainlogScreenId.SESSION, + onBack = { + screen = + exerciseReturnTarget + }, + onSaved = { + catalogRevision += 1 + + screen = + exerciseReturnTarget + }, + ) + + TrainlogScreenId.BODY -> + BodyScreen( + repository = repository, + onBack = { + screen = + TrainlogScreenId.HOME + }, + ) + + TrainlogScreenId.HISTORY -> + HistoryScreen( + repository = repository, + onBack = { + screen = + TrainlogScreenId.HOME + }, + onOpenSession = { + sessionId -> + selectedSessionId = + sessionId + + screen = + TrainlogScreenId.SESSION_DETAIL + }, + ) + + TrainlogScreenId.SESSION_DETAIL -> + SessionDetailScreen( + repository = repository, + sessionId = + selectedSessionId, + onBack = { + screen = + TrainlogScreenId.HISTORY + }, + ) + } +} diff --git a/android/app/src/main/java/com/labfytools/trainlog/ui/TrainlogComponents.kt b/android/app/src/main/java/com/labfytools/trainlog/ui/TrainlogComponents.kt new file mode 100644 index 0000000..d840bda --- /dev/null +++ b/android/app/src/main/java/com/labfytools/trainlog/ui/TrainlogComponents.kt @@ -0,0 +1,261 @@ +package com.labfytools.trainlog.ui + +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxWithConstraints +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.imePadding +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.foundation.layout.navigationBarsPadding +import androidx.compose.foundation.layout.statusBarsPadding +import androidx.compose.foundation.text.BasicText +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.labfytools.trainlog.ui.theme.LocalTrainlogColors +import com.labfytools.trainlog.ui.theme.TrainlogTypography + +private val FullAsciiBanner = + """ +TTTTT RRRR AAA IIIII N N L OOO GGG + T R R A A I NN N L O O G + T RRRR AAAAA I N N N L O O G GG + T R R A A I N NN L O O G G + T R R A A IIIII N N LLLLL OOO GGG +""".trimIndent() + +@Composable +fun TrainlogScreen( + subtitle: String, + content: @Composable ColumnScope.() -> Unit, +) { + val colors = + LocalTrainlogColors.current + + Column( + modifier = + Modifier + .background(colors.background) + .statusBarsPadding() + .navigationBarsPadding() + .imePadding() + .verticalScroll( + rememberScrollState() + ) + .padding( + PaddingValues( + horizontal = 16.dp, + vertical = 18.dp, + ) + ), + ) { + TrainlogBanner( + subtitle = subtitle + ) + + content() + } +} + +@Composable +private fun TrainlogBanner( + subtitle: String +) { + val colors = + LocalTrainlogColors.current + + BoxWithConstraints( + modifier = + Modifier + .fillMaxWidth() + .padding( + bottom = 18.dp + ) + ) { + val wide = + maxWidth >= 560.dp + + Column( + modifier = + Modifier.fillMaxWidth(), + horizontalAlignment = + Alignment.CenterHorizontally, + ) { + BasicText( + text = + if (wide) { + FullAsciiBanner + } else { + "T R A I N L O G" + }, + style = + TrainlogTypography.banner.copy( + color = colors.accent, + fontWeight = FontWeight.Bold, + fontSize = + if (wide) { + 16.sp + } else { + 24.sp + }, + ), + ) + + BasicText( + text = ":: $subtitle ::", + modifier = + Modifier.padding( + top = 6.dp + ), + style = + TrainlogTypography.normal.copy( + color = colors.muted, + ), + ) + } + } +} + +@Composable +fun TrainlogFrame( + title: String, + modifier: Modifier = Modifier, + active: Boolean = true, + content: @Composable ColumnScope.() -> Unit, +) { + val colors = + LocalTrainlogColors.current + + val borderColor = + if (active) { + colors.warning + } else { + colors.muted + } + + Column( + modifier = + modifier + .fillMaxWidth() + .padding( + bottom = 14.dp + ) + .border( + width = 1.dp, + color = borderColor, + ) + .padding( + horizontal = 14.dp, + vertical = 12.dp, + ) + ) { + BasicText( + text = title.uppercase(), + modifier = + Modifier.padding( + bottom = 12.dp + ), + style = + TrainlogTypography.normal.copy( + color = borderColor, + fontWeight = FontWeight.Bold, + ), + ) + + content() + } +} + +@Composable +fun TrainlogAction( + label: String, + description: String, + onClick: () -> Unit, + modifier: Modifier = Modifier, + accent: Color? = null, +) { + val colors = + LocalTrainlogColors.current + + val actualAccent = + accent ?: colors.accent + + Box( + modifier = + modifier + .fillMaxWidth() + .padding( + vertical = 5.dp + ) + .border( + width = 1.dp, + color = colors.surfaceAlt, + ) + .background( + colors.surface + ) + .clickable( + onClick = onClick + ) + .padding( + horizontal = 14.dp, + vertical = 14.dp, + ) + ) { + Column { + BasicText( + text = label, + style = + TrainlogTypography.normal.copy( + color = actualAccent, + fontWeight = FontWeight.Bold, + ), + ) + + BasicText( + text = description, + modifier = + Modifier.padding( + top = 4.dp + ), + style = + TrainlogTypography.small.copy( + color = colors.text, + ), + ) + } + } +} + +@Composable +fun TrainlogInfo( + text: String, + color: Color? = null, +) { + val colors = + LocalTrainlogColors.current + + BasicText( + text = text, + modifier = + Modifier.padding( + vertical = 4.dp + ), + style = + TrainlogTypography.normal.copy( + color = + color ?: colors.text, + ), + ) +} diff --git a/android/app/src/main/java/com/labfytools/trainlog/ui/theme/TrainlogTheme.kt b/android/app/src/main/java/com/labfytools/trainlog/ui/theme/TrainlogTheme.kt new file mode 100644 index 0000000..3061704 --- /dev/null +++ b/android/app/src/main/java/com/labfytools/trainlog/ui/theme/TrainlogTheme.kt @@ -0,0 +1,78 @@ +package com.labfytools.trainlog.ui.theme + +import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.runtime.staticCompositionLocalOf +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.unit.sp + +data class TrainlogColors( + val background: Color, + val surface: Color, + val surfaceAlt: Color, + val text: Color, + val accent: Color, + val success: Color, + val warning: Color, + val error: Color, + val muted: Color, + val graph: Color, +) + +private val TrainlogDarkColors = + TrainlogColors( + background = Color(0xFF1E1E2E), + surface = Color(0xFF181825), + surfaceAlt = Color(0xFF313244), + text = Color(0xFFCDD6F4), + accent = Color(0xFF94E2D5), + success = Color(0xFFA6E3A1), + warning = Color(0xFFF9E2AF), + error = Color(0xFFF38BA8), + muted = Color(0xFF89B4FA), + graph = Color(0xFFF5C2E7), + ) + +val LocalTrainlogColors = + staticCompositionLocalOf { + TrainlogDarkColors + } + +object TrainlogTypography { + val normal = + TextStyle( + fontFamily = FontFamily.Monospace, + fontSize = 16.sp, + ) + + val small = + TextStyle( + fontFamily = FontFamily.Monospace, + fontSize = 13.sp, + ) + + val title = + TextStyle( + fontFamily = FontFamily.Monospace, + fontSize = 20.sp, + ) + + val banner = + TextStyle( + fontFamily = FontFamily.Monospace, + fontSize = 24.sp, + ) +} + +@Composable +fun TrainlogTheme( + content: @Composable () -> Unit +) { + CompositionLocalProvider( + LocalTrainlogColors provides + TrainlogDarkColors, + content = content, + ) +} diff --git a/android/app/src/main/res/drawable/ic_launcher_foreground.xml b/android/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..e7d45b9 --- /dev/null +++ b/android/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..36e19c1 --- /dev/null +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..36e19c1 --- /dev/null +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..759971c --- /dev/null +++ b/android/app/src/main/res/values/colors.xml @@ -0,0 +1,14 @@ + + + #1E1E2E + #181825 + #313244 + + #CDD6F4 + #94E2D5 + #A6E3A1 + #F9E2AF + #F38BA8 + #89B4FA + #F5C2E7 + diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..31da2ce --- /dev/null +++ b/android/app/src/main/res/values/strings.xml @@ -0,0 +1,4 @@ + + + Trainlog + diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..3efca3a --- /dev/null +++ b/android/app/src/main/res/values/themes.xml @@ -0,0 +1,35 @@ + + + + diff --git a/android/build.gradle.kts b/android/build.gradle.kts new file mode 100644 index 0000000..579d878 --- /dev/null +++ b/android/build.gradle.kts @@ -0,0 +1,4 @@ +plugins { + id("com.android.application") version "9.4.0" apply false + id("org.jetbrains.kotlin.plugin.compose") version "2.3.21" apply false +} diff --git a/android/gradle.properties b/android/gradle.properties new file mode 100644 index 0000000..d83de41 --- /dev/null +++ b/android/gradle.properties @@ -0,0 +1,4 @@ +org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 +org.gradle.parallel=true +android.useAndroidX=true +kotlin.code.style=official diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..eddabd2eef8d94a5437d6168ff9c87a78ff725b3 GIT binary patch literal 47505 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/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/android/gradlew.bat b/android/gradlew.bat new file mode 100644 index 0000000..8508ef6 --- /dev/null +++ b/android/gradlew.bat @@ -0,0 +1,82 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem gradlew startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +"%COMSPEC%" /c exit 1 + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +"%COMSPEC%" /c exit 1 + +:execute +@rem Setup the command line + + + +@rem Execute gradlew +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel + +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL% diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts new file mode 100644 index 0000000..e4d26b6 --- /dev/null +++ b/android/settings.gradle.kts @@ -0,0 +1,21 @@ +pluginManagement { + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + +dependencyResolutionManagement { + repositoriesMode.set( + RepositoriesMode.FAIL_ON_PROJECT_REPOS + ) + + repositories { + google() + mavenCentral() + } +} + +rootProject.name = "TrainlogAndroid" +include(":app") diff --git a/docs/android.md b/docs/android.md index 76a4c95..60f013b 100644 --- a/docs/android.md +++ b/docs/android.md @@ -347,3 +347,286 @@ The app must never infer an input form from an exercise display name. Initial development uses fictitious records. Test/development data is removed before normal production use starts. + + +## Android scaffold implementation + +The Android project now lives in: + +```text +android/ +``` + +It is a native Kotlin + Jetpack Compose application with a custom Trainlog +visual layer rather than default Material presentation. + +Implemented scaffold navigation: + +```text +Accueil +├── Enregistrer une séance +│ ├── Ajouter depuis le catalogue +│ └── Créer un nouvel exercice +│ └── returns to session flow +├── Enregistrer un exercice +└── Enregistrer des mensurations +``` + +The launcher icon is a minimal themed `T`. + +The UI reuses the Trainlog visual roles from the TUI: + +```text +background +accent/cyan +success/green +warning/yellow +error/red +muted/blue +graph/magenta +``` + +Android forms will be driven by: + +```text +recording_mode +tracking_mode +data_fields +``` + +The scaffold intentionally does not implement persistence or MTP yet. + +Next: + +```text +ANDROID_LOCAL_MODEL_AND_PERSISTENCE=NEXT +ANDROID_SESSION_FORM=AFTER +ANDROID_MTP_SYNC=AFTER_LOCAL_WORKFLOW +``` + + + +## Android local catalog checkpoint + +The Android application now has a persistent local exercise catalog. + +Implemented: + +```text +Android SQLite exercise database +profile-aware exercise model +standalone exercise creation +inline exercise creation from session flow +catalog survives application restart +session screen refreshes after inline creation +``` + +Android uses the same semantic axes as desktop: + +```text +recording_mode +tracking_mode +data_fields +``` + +Known supplemental fields remain: + +```text +SPEED_KMH +DISTANCE_KM +``` + +Continuous creation forces duration tracking. Set-based creation keeps +supplemental continuous fields disabled. + +The local Android schema is intentionally independent from the desktop SQLite +schema. Synchronization later exchanges versioned domain data rather than +copying SQLite database files. + +Next: + +```text +ANDROID_SESSION_RECORDING=NEXT +ANDROID_BODY_PERSISTENCE=AFTER +MTP_SYNC=AFTER_LOCAL_WORKFLOWS +``` + + + +## Android session recording checkpoint + +Android can now build and persist real local sessions. + +Flow: + +```text +Session +→ choose catalog exercise +→ profile-aware entry form +→ add exercise to session draft +→ repeat for additional exercises +→ save session +``` + +Profile-aware forms: + +```text +SETS + REPS + set count + repetitions per set + +SETS + DURATION + set count + duration per set + +CONTINUOUS + DURATION + duration minutes + configured speed/distance fields +``` + +Persistence mirrors the domain split: + +```text +sessions +session_exercises +performed_sets +continuous_activity +``` + +Continuous exercises do not create fake performed sets. + +The Android local database version is now 2. + +Next: + +```text +ANDROID_SESSION_HISTORY=NEXT +ANDROID_BODY_PERSISTENCE=AFTER +MTP_SYNC=AFTER_LOCAL_WORKFLOWS +``` + + + +## Android session history checkpoint + +Android now exposes persisted local sessions through: + +```text +Accueil +→ Consultation +→ Historique des séances +→ Détail séance +``` + +Detail rendering remains profile-aware: + +```text +SETS + REPS + one line per performed set with reps + +SETS + DURATION + one line per performed set with duration + +CONTINUOUS + duration + configured speed + configured distance +``` + +The history reader uses the persisted session snapshot metadata rather than +inferring behavior from exercise names. + +Next: + +```text +ANDROID_BODY_PERSISTENCE=NEXT +ANDROID_LOCAL_WORKFLOWS_THEN_MTP +``` + + + +## Android body measurement checkpoint + +The Android body workflow is now persistent and uses the same measurement set +as the TUI. + +Fields: + +```text +weight +neck +shoulders +chest +waist +hips +left/right arm +left/right forearm +left/right thigh +left/right calf +``` + +Rules: + +```text +empty field = measurement not taken +at least one positive metric required +comma or dot accepted for decimal entry +``` + +Android SQLite schema version: + +```text +3 +``` + +The body screen also shows the five most recent observations. + +At this point the three primary Android recording workflows are locally +functional: + +```text +session recording +exercise creation +body measurement recording +``` + +Next: + +```text +ANDROID_LOCAL_POLISH_AND_VALIDATION=NEXT +MTP_SYNC=AFTER_LOCAL_CHECKPOINT +``` + + + +## Local Android workflows — validated + +```text +ANDROID_SCAFFOLD=PASS +ANDROID_THEME_PARITY=PASS +ANDROID_EXERCISE_CREATE=PASS +ANDROID_INLINE_EXERCISE_CREATE=PASS +ANDROID_SESSION_RECORDING=PASS +ANDROID_SESSION_HISTORY=PASS +ANDROID_BODY_RECORDING=PASS +ANDROID_LOCAL_WORKFLOWS=PASS +``` + +The application is now locally usable for its three primary recording flows: + +```text +session +exercise +body measurements +``` + +Session and history rendering are profile-aware. + +The Android-local SQLite database is not a synchronization format. + +Next: + +```text +ANDROID_MTP_SYNC=NEXT +``` + diff --git a/docs/reviews/android_local_workflows.md b/docs/reviews/android_local_workflows.md new file mode 100644 index 0000000..ebeed41 --- /dev/null +++ b/docs/reviews/android_local_workflows.md @@ -0,0 +1,217 @@ +# Android local workflows checkpoint + +## Status + +```text +ANDROID_SCAFFOLD=PASS +ANDROID_THEME_PARITY=PASS +ANDROID_SYSTEM_BARS=PASS +ANDROID_EXERCISE_CREATE=PASS +ANDROID_INLINE_EXERCISE_CREATE=PASS +ANDROID_SESSION_RECORDING=PASS +ANDROID_SESSION_HISTORY=PASS +ANDROID_SESSION_DETAIL=PASS +ANDROID_BODY_RECORDING=PASS +ANDROID_LOCAL_WORKFLOWS=PASS + +ANDROID_MTP_SYNC=NEXT +``` + +## Visual contract + +Android and TUI share the same Trainlog visual language: + +```text +dark background +monospace typography +cyan/teal accent +yellow active/focus frame +green success +red error +blue muted/navigation +magenta graph role +``` + +The Android launcher icon is intentionally only: + +```text +T +``` + +using Trainlog theme colors. + +## Home structure + +```text +ENREGISTREMENT +├── Enregistrer une séance +├── Enregistrer un exercice +└── Enregistrer des mensurations + +CONSULTATION +└── Historique des séances +``` + +## Exercise creation + +Android uses the same exercise-profile model as desktop: + +```text +recording_mode +tracking_mode +data_fields +``` + +Supported profile combinations: + +```text +SETS + REPS +SETS + DURATION +CONTINUOUS + DURATION +``` + +Known supplemental fields: + +```text +SPEED_KMH +DISTANCE_KM +``` + +Behavior is never inferred from exercise names. + +Exercise creation is available: + +```text +standalone +inline from session recording +``` + +Inline creation returns directly to the session workflow. + +## Session recording + +The local Android session flow is: + +```text +choose catalog exercise +→ profile-aware form +→ add to session draft +→ repeat +→ save session +``` + +Persistence is split semantically: + +```text +SET-based exercise + performed_sets + +CONTINUOUS exercise + continuous_activity +``` + +Continuous activities never create fake performed sets. + +## Session history + +Persisted sessions are visible in Android history. + +Detail rendering remains profile-aware: + +```text +SETS + REPS + per-set reps + +SETS + DURATION + per-set durations + +CONTINUOUS + duration + configured speed + configured distance +``` + +## Body measurements + +Android supports the same body measurement fields as the TUI: + +```text +weight +neck +shoulders +chest +waist +hips +left/right arm +left/right forearm +left/right thigh +left/right calf +``` + +Rules: + +```text +empty = not measured +comma or dot accepted +at least one positive metric required +``` + +Recent observations are displayed in the body screen. + +## Android local database + +Current Android-local schema version: + +```text +3 +``` + +Current local tables include: + +```text +exercises +sessions +session_exercises +performed_sets +continuous_activity +body_observations +``` + +The Android SQLite database is intentionally independent from the desktop +SQLite database. + +Synchronization must exchange versioned Trainlog domain data. + +Do not synchronize or copy SQLite database files. + +## Manual validation + +Validated on a real Samsung device through ADB: + +```text +APK build/install/launch +exercise creation +catalog persistence across restart +session recording +performed-set persistence +session history/detail +body observation persistence +``` + +Example validated session: + +```text +Pompe +SETS + REPS +5 sets × 10 reps +``` + +## Next cursor + +```text +ANDROID_MTP_SYNC=NEXT +``` + +The next slice should connect the already-validated direct MTP transport design +to Android/desktop exchange without weakening the frozen Trainlog JSON v1 +contract. diff --git a/docs/roadmap.md b/docs/roadmap.md index 0c3369d..028c84b 100644 --- a/docs/roadmap.md +++ b/docs/roadmap.md @@ -349,3 +349,30 @@ Next Android slice: Do not revert continuous activities to performed sets. Do not modify JSON v1 to accommodate continuous metrics. + + +## Android local checkpoint + +```text +ANDROID_PROJECT=PASS +ANDROID_THEME=PASS +ANDROID_EXERCISE_CATALOG=PASS +ANDROID_SESSION_RECORDING=PASS +ANDROID_SESSION_HISTORY=PASS +ANDROID_BODY_RECORDING=PASS + +ANDROID_MTP_SYNC=NEXT +``` + +The next implementation cursor is synchronization between the Android client +and the desktop TUI over the existing direct-MTP transport architecture. + +Constraints remain: + +```text +no GVFS/FUSE dependency +no SQLite-file synchronization +TRAINLOG_FORMAT_V1 remains frozen +profile-aware data must not be forced into v1 +``` +