From 2a48d79c7769c3d8cd82edb2280f07556f2c2fa7 Mon Sep 17 00:00:00 2001 From: Jay Date: Sat, 11 Jul 2026 18:34:57 -0400 Subject: [PATCH] Scaffold Android project per BRIEF.md Single-module Kotlin/Compose app with manual DI container. Pure-Kotlin measurement math (orientation mapping, two-sample per-mode calibration, EMA smoothing, lock hysteresis, display deadband) fully unit-tested. Sensor fallback: game rotation vector -> gravity -> low-passed accelerometer. Live Level (manual Surface|Edge) and Angle (hold-to-zero) scaffolds; Ruler/Tools placeholders; stub Pro entitlement. Co-Authored-By: Claude Fable 5 --- README.md | 42 +++ app/build.gradle.kts | 73 +++++ app/proguard-rules.pro | 1 + app/src/main/AndroidManifest.xml | 31 +++ .../main/java/com/onthelevel/MainActivity.kt | 98 +++++++ .../main/java/com/onthelevel/OnTheLevelApp.kt | 25 ++ .../onthelevel/core/billing/Entitlement.kt | 55 ++++ .../onthelevel/core/design/KeepScreenOn.kt | 18 ++ .../java/com/onthelevel/core/design/Theme.kt | 85 ++++++ .../core/sensors/AndroidSensorSource.kt | 101 +++++++ .../core/sensors/DisplayDeadband.kt | 34 +++ .../java/com/onthelevel/core/sensors/Ema.kt | 26 ++ .../onthelevel/core/sensors/GravitySample.kt | 16 ++ .../onthelevel/core/sensors/LockDetector.kt | 67 +++++ .../core/sensors/OrientationMath.kt | 66 +++++ .../onthelevel/core/sensors/SensorSource.kt | 24 ++ .../core/sensors/TwoSampleCalibration.kt | 51 ++++ .../core/settings/SettingsRepository.kt | 75 ++++++ .../onthelevel/feature/angle/AngleScreen.kt | 146 ++++++++++ .../onthelevel/feature/level/LevelPipeline.kt | 100 +++++++ .../onthelevel/feature/level/LevelScreen.kt | 223 ++++++++++++++++ .../onthelevel/feature/ruler/RulerScreen.kt | 55 ++++ .../onthelevel/feature/tools/ToolsScreen.kt | 82 ++++++ .../res/drawable/ic_launcher_foreground.xml | 23 ++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 + app/src/main/res/values/colors.xml | 5 + app/src/main/res/values/strings.xml | 4 + app/src/main/res/values/themes.xml | 7 + .../core/sensors/DisplayDeadbandTest.kt | 30 +++ .../com/onthelevel/core/sensors/EmaTest.kt | 42 +++ .../core/sensors/LockDetectorTest.kt | 73 +++++ .../core/sensors/OrientationMathTest.kt | 85 ++++++ .../core/sensors/TwoSampleCalibrationTest.kt | 47 ++++ build.gradle.kts | 4 + gradle.properties | 4 + gradle/libs.versions.toml | 42 +++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 45457 bytes gradle/wrapper/gradle-wrapper.properties | 8 + gradlew | 251 ++++++++++++++++++ gradlew.bat | 94 +++++++ settings.gradle.kts | 26 ++ 41 files changed, 2244 insertions(+) create mode 100644 README.md create mode 100644 app/build.gradle.kts create mode 100644 app/proguard-rules.pro create mode 100644 app/src/main/AndroidManifest.xml create mode 100644 app/src/main/java/com/onthelevel/MainActivity.kt create mode 100644 app/src/main/java/com/onthelevel/OnTheLevelApp.kt create mode 100644 app/src/main/java/com/onthelevel/core/billing/Entitlement.kt create mode 100644 app/src/main/java/com/onthelevel/core/design/KeepScreenOn.kt create mode 100644 app/src/main/java/com/onthelevel/core/design/Theme.kt create mode 100644 app/src/main/java/com/onthelevel/core/sensors/AndroidSensorSource.kt create mode 100644 app/src/main/java/com/onthelevel/core/sensors/DisplayDeadband.kt create mode 100644 app/src/main/java/com/onthelevel/core/sensors/Ema.kt create mode 100644 app/src/main/java/com/onthelevel/core/sensors/GravitySample.kt create mode 100644 app/src/main/java/com/onthelevel/core/sensors/LockDetector.kt create mode 100644 app/src/main/java/com/onthelevel/core/sensors/OrientationMath.kt create mode 100644 app/src/main/java/com/onthelevel/core/sensors/SensorSource.kt create mode 100644 app/src/main/java/com/onthelevel/core/sensors/TwoSampleCalibration.kt create mode 100644 app/src/main/java/com/onthelevel/core/settings/SettingsRepository.kt create mode 100644 app/src/main/java/com/onthelevel/feature/angle/AngleScreen.kt create mode 100644 app/src/main/java/com/onthelevel/feature/level/LevelPipeline.kt create mode 100644 app/src/main/java/com/onthelevel/feature/level/LevelScreen.kt create mode 100644 app/src/main/java/com/onthelevel/feature/ruler/RulerScreen.kt create mode 100644 app/src/main/java/com/onthelevel/feature/tools/ToolsScreen.kt create mode 100644 app/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 app/src/main/res/values/colors.xml create mode 100644 app/src/main/res/values/strings.xml create mode 100644 app/src/main/res/values/themes.xml create mode 100644 app/src/test/java/com/onthelevel/core/sensors/DisplayDeadbandTest.kt create mode 100644 app/src/test/java/com/onthelevel/core/sensors/EmaTest.kt create mode 100644 app/src/test/java/com/onthelevel/core/sensors/LockDetectorTest.kt create mode 100644 app/src/test/java/com/onthelevel/core/sensors/OrientationMathTest.kt create mode 100644 app/src/test/java/com/onthelevel/core/sensors/TwoSampleCalibrationTest.kt create mode 100644 build.gradle.kts create mode 100644 gradle.properties create mode 100644 gradle/libs.versions.toml create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle.kts diff --git a/README.md b/README.md new file mode 100644 index 0000000..0e0f11a --- /dev/null +++ b/README.md @@ -0,0 +1,42 @@ +# On the Level + +Offline-first Android pocket toolset: a trustworthy level, angle meter, and +calibrated screen ruler (Pro). Kotlin + Jetpack Compose, single module, no backend. + +- **[BRIEF.md](BRIEF.md)** — the authoritative v1 product & technical brief +- **[AUDIT.md](AUDIT.md)** — audit of the brief; the amendments it lists are incorporated +- **resources/** — concept board (visual direction) + +## Building + +Open in Android Studio, or: + +```sh +./gradlew assembleDebug # build +./gradlew testDebugUnitTest # measurement-math unit tests +``` + +## Scaffold status + +The project skeleton follows BRIEF.md §Sensor and measurement architecture. +Implemented and tested: + +- `core/sensors` — sensor selection (game rotation vector → gravity → low-passed + accelerometer), device-frame gravity stream, and the pure measurement math: + orientation mapping, two-sample per-mode calibration, EMA smoothing, + lock hysteresis/dwell/debounce, display deadband. All unit-tested. +- `core/settings` — DataStore preferences and per-mode calibration persistence. +- `core/billing` — entitlement interface with a stub (free-tier) implementation. +- `feature/level`, `feature/angle` — live numeric scaffolds wired to the real + sensor pipeline, with manual Surface|Edge selection, lock state, hold-to-zero. +- `feature/ruler`, `feature/tools` — static placeholders. + +Not yet implemented (deliberately — see TODO markers): + +- The tactile vial visuals and the spring-animated **display value** (value 3 of 3 + in the brief); scaffold screens render the deadbanded stable value directly. +- Guided calibration flow UI (math and persistence are done). +- Edge-mode readout counter-rotation on the portrait-locked activity. +- Play Billing implementation of `ProEntitlementRepository`. +- Screen ruler measurement UI and per-display scale persistence. +- Audio cue, reduced-motion behaviors, preferences UI. diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..919b797 --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,73 @@ +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.compose) +} + +android { + namespace = "com.onthelevel" + compileSdk = 37 + + defaultConfig { + applicationId = "com.jsjdesigns.onthelevel" + minSdk = 26 + targetSdk = 37 + versionCode = 1 + versionName = "0.1" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + vectorDrawables { useSupportLibrary = true } + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } + + buildFeatures { + compose = true + } + + packaging { + resources { + excludes += "/META-INF/{AL2.0,LGPL2.1}" + } + } +} + +dependencies { + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.activity.compose) + implementation(libs.androidx.lifecycle.runtime.ktx) + implementation(libs.androidx.lifecycle.runtime.compose) + implementation(libs.androidx.lifecycle.viewmodel.compose) + + implementation(platform(libs.androidx.compose.bom)) + implementation(libs.androidx.compose.ui) + implementation(libs.androidx.compose.ui.graphics) + implementation(libs.androidx.compose.ui.tooling.preview) + implementation(libs.androidx.compose.material3) + implementation(libs.androidx.compose.material.icons.extended) + + implementation(libs.androidx.navigation.compose) + implementation(libs.androidx.datastore.preferences) + // Declared now so core/billing's real implementation lands without build changes (BRIEF.md §Monetization). + implementation(libs.billing.ktx) + + debugImplementation(libs.androidx.compose.ui.tooling) + + testImplementation(libs.junit) + testImplementation(libs.kotlinx.coroutines.test) + androidTestImplementation(libs.androidx.junit) + androidTestImplementation(libs.androidx.espresso.core) + androidTestImplementation(platform(libs.androidx.compose.bom)) +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..fb164d6 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1 @@ +# Add project specific ProGuard rules here. diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..a5298ec --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/onthelevel/MainActivity.kt b/app/src/main/java/com/onthelevel/MainActivity.kt new file mode 100644 index 0000000..f3741e0 --- /dev/null +++ b/app/src/main/java/com/onthelevel/MainActivity.kt @@ -0,0 +1,98 @@ +package com.onthelevel + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.Adjust +import androidx.compose.material.icons.outlined.Handyman +import androidx.compose.material.icons.outlined.SquareFoot +import androidx.compose.material3.Icon +import androidx.compose.material3.NavigationBar +import androidx.compose.material3.NavigationBarItem +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.foundation.layout.padding +import androidx.navigation.NavGraph.Companion.findStartDestination +import androidx.navigation.compose.NavHost +import androidx.navigation.compose.composable +import androidx.navigation.compose.currentBackStackEntryAsState +import androidx.navigation.compose.rememberNavController +import com.onthelevel.core.design.OnTheLevelTheme +import com.onthelevel.feature.angle.AngleScreen +import com.onthelevel.feature.level.LevelScreen +import com.onthelevel.feature.ruler.RulerScreen +import com.onthelevel.feature.tools.ToolsScreen + +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + enableEdgeToEdge() + super.onCreate(savedInstanceState) + val container = (application as OnTheLevelApp).container + setContent { + OnTheLevelTheme { + AppRoot(container) + } + } + } +} + +private data class TopDestination( + val route: String, + val label: String, + val icon: ImageVector, +) + +private val topDestinations = listOf( + TopDestination("level", "Level", Icons.Outlined.Adjust), + TopDestination("angle", "Angle", Icons.Outlined.SquareFoot), + TopDestination("tools", "Tools", Icons.Outlined.Handyman), +) + +@Composable +private fun AppRoot(container: AppContainer) { + val navController = rememberNavController() + val backStackEntry by navController.currentBackStackEntryAsState() + val currentRoute = backStackEntry?.destination?.route + + Scaffold( + bottomBar = { + NavigationBar { + topDestinations.forEach { destination -> + NavigationBarItem( + selected = currentRoute == destination.route, + onClick = { + navController.navigate(destination.route) { + popUpTo(navController.graph.findStartDestination().id) { + saveState = true + } + launchSingleTop = true + restoreState = true + } + }, + icon = { Icon(destination.icon, contentDescription = null) }, + label = { Text(destination.label) }, + ) + } + } + }, + ) { padding -> + NavHost( + navController = navController, + startDestination = "level", + modifier = Modifier.padding(padding), + ) { + composable("level") { LevelScreen(container) } + composable("angle") { AngleScreen(container) } + composable("tools") { + ToolsScreen(onOpenRuler = { navController.navigate("ruler") }) + } + composable("ruler") { RulerScreen(container) } + } + } +} diff --git a/app/src/main/java/com/onthelevel/OnTheLevelApp.kt b/app/src/main/java/com/onthelevel/OnTheLevelApp.kt new file mode 100644 index 0000000..e07d62d --- /dev/null +++ b/app/src/main/java/com/onthelevel/OnTheLevelApp.kt @@ -0,0 +1,25 @@ +package com.onthelevel + +import android.app.Application +import android.content.Context +import com.onthelevel.core.billing.ProEntitlementRepository +import com.onthelevel.core.billing.StubProEntitlementRepository +import com.onthelevel.core.sensors.AndroidSensorSource +import com.onthelevel.core.sensors.SensorSource +import com.onthelevel.core.settings.SettingsRepository + +/** + * Manual application container — deliberately no DI framework for an app this size + * (BRIEF.md §Sensor and measurement architecture). + */ +class AppContainer(context: Context) { + private val appContext = context.applicationContext + + val sensorSource: SensorSource by lazy { AndroidSensorSource(appContext) } + val settings: SettingsRepository by lazy { SettingsRepository(appContext) } + val entitlement: ProEntitlementRepository by lazy { StubProEntitlementRepository() } +} + +class OnTheLevelApp : Application() { + val container: AppContainer by lazy { AppContainer(this) } +} diff --git a/app/src/main/java/com/onthelevel/core/billing/Entitlement.kt b/app/src/main/java/com/onthelevel/core/billing/Entitlement.kt new file mode 100644 index 0000000..5ff5c85 --- /dev/null +++ b/app/src/main/java/com/onthelevel/core/billing/Entitlement.kt @@ -0,0 +1,55 @@ +package com.onthelevel.core.billing + +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow + +/** + * Pro entitlement state (BRIEF.md §Monetization). One permanent non-consumable + * product; no subscription. + */ +data class Entitlement( + val isPro: Boolean, + val source: Source, +) { + enum class Source { + /** No confirmation yet — the default, and always safe: free tools are complete. */ + NONE, + /** Confirmed by Google Play this session. */ + PLAY_CONFIRMED, + /** Previously Play-confirmed, restored from local cache (offline job-site use). */ + CACHED, + } + + companion object { + val FREE = Entitlement(isPro = false, source = Source.NONE) + } +} + +/** + * The ONLY doorway between billing and the rest of the app. Feature code observes + * [entitlement]; nothing outside core/billing may touch Play Billing types + * (AUDIT.md: Pro boundary containment). + */ +interface ProEntitlementRepository { + val entitlement: StateFlow + + /** Re-query owned purchases when possible (app resume, purchase flow completion). */ + suspend fun refresh() +} + +/** + * Scaffold stand-in: everyone is free tier. Replaced by the Play Billing + * implementation, which must: + * - initialize lazily/async — free tools never block on Play services + * - cache a Play-confirmed entitlement in DataStore for offline use + * - never grant from an arbitrary preference value or a PENDING purchase + */ +class StubProEntitlementRepository : ProEntitlementRepository { + private val state = MutableStateFlow(Entitlement.FREE) + override val entitlement: StateFlow = state.asStateFlow() + override suspend fun refresh() = Unit +} + +// TODO(billing): PlayBillingEntitlementRepository against the declared billing-ktx +// dependency, product id "on_the_level_pro", per the contract above. diff --git a/app/src/main/java/com/onthelevel/core/design/KeepScreenOn.kt b/app/src/main/java/com/onthelevel/core/design/KeepScreenOn.kt new file mode 100644 index 0000000..939c494 --- /dev/null +++ b/app/src/main/java/com/onthelevel/core/design/KeepScreenOn.kt @@ -0,0 +1,18 @@ +package com.onthelevel.core.design + +import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect +import androidx.compose.ui.platform.LocalView + +/** + * Levels are used hands-free; the screen must not time out mid-measurement + * (BRIEF.md §Level). Scoped to the composable, so leaving the screen releases it. + */ +@Composable +fun KeepScreenOn() { + val view = LocalView.current + DisposableEffect(view) { + view.keepScreenOn = true + onDispose { view.keepScreenOn = false } + } +} diff --git a/app/src/main/java/com/onthelevel/core/design/Theme.kt b/app/src/main/java/com/onthelevel/core/design/Theme.kt new file mode 100644 index 0000000..352356f --- /dev/null +++ b/app/src/main/java/com/onthelevel/core/design/Theme.kt @@ -0,0 +1,85 @@ +package com.onthelevel.core.design + +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Typography +import androidx.compose.material3.darkColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp + +/** + * Palette from the concept board (resources/Bubble Level Concepts.dc.html): + * deep graphite glass, warm amber spirit fluid, lime for the locked state. + * The design is dark-only in v1 — this is an instrument, not a document. + * Per BRIEF.md, color never carries state alone; labels and numbers always accompany it. + */ +object LevelColors { + val Graphite = Color(0xFF0A0A0B) + val GraphiteRaised = Color(0xFF15181D) + val PanelStroke = Color(0x12FFFFFF) + val Panel = Color(0x0AFFFFFF) + + val Amber = Color(0xFFFFC44E) + val AmberHighlight = Color(0xFFFFEEB0) + val AmberDeep = Color(0xFFE0961E) + + val LimeLock = Color(0xFFCBEF5C) + val LimeLockText = Color(0xFFEAFFC2) + + val Cream = Color(0xFFEDEBE6) + val TextPrimary = Color(0xFFF5F4F1) + val TextDim = Color(0x6BFFFFFF) + val TextFaint = Color(0x55FFFFFF) +} + +private val DarkScheme = darkColorScheme( + primary = LevelColors.Amber, + onPrimary = LevelColors.Graphite, + secondary = LevelColors.LimeLock, + onSecondary = LevelColors.Graphite, + background = LevelColors.Graphite, + onBackground = LevelColors.TextPrimary, + surface = LevelColors.GraphiteRaised, + onSurface = LevelColors.TextPrimary, + surfaceVariant = LevelColors.GraphiteRaised, + onSurfaceVariant = LevelColors.TextDim, + outline = LevelColors.PanelStroke, +) + +// TODO(design): bundle Space Grotesk + IBM Plex Mono per the concept board. +// Until then: system sans for labels, platform monospace for all numeric readouts +// so digits don't jitter horizontally as values change. +val ReadoutFontFamily = FontFamily.Monospace + +private val LevelTypography = Typography( + displayLarge = TextStyle( + fontFamily = ReadoutFontFamily, + fontWeight = FontWeight.Light, + fontSize = 96.sp, + letterSpacing = (-2).sp, + ), + headlineMedium = TextStyle( + fontFamily = ReadoutFontFamily, + fontWeight = FontWeight.Normal, + fontSize = 28.sp, + ), + labelSmall = TextStyle( + fontWeight = FontWeight.SemiBold, + fontSize = 11.sp, + letterSpacing = 2.sp, + ), +) + +@Composable +fun OnTheLevelTheme(content: @Composable () -> Unit) { + // Dark-only by design; isSystemInDarkTheme() intentionally unused in v1. + MaterialTheme( + colorScheme = DarkScheme, + typography = LevelTypography, + content = content, + ) +} diff --git a/app/src/main/java/com/onthelevel/core/sensors/AndroidSensorSource.kt b/app/src/main/java/com/onthelevel/core/sensors/AndroidSensorSource.kt new file mode 100644 index 0000000..96602ad --- /dev/null +++ b/app/src/main/java/com/onthelevel/core/sensors/AndroidSensorSource.kt @@ -0,0 +1,101 @@ +package com.onthelevel.core.sensors + +import android.content.Context +import android.hardware.Sensor +import android.hardware.SensorEvent +import android.hardware.SensorEventListener +import android.hardware.SensorManager +import kotlinx.coroutines.channels.awaitClose +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.callbackFlow +import kotlinx.coroutines.flow.emptyFlow + +/** + * Sensor selection order (BRIEF.md): GAME_ROTATION_VECTOR → GRAVITY → low-passed + * ACCELEROMETER. Game rotation vector is deliberate — it excludes the magnetometer, + * which lies near the steel this app is used against (AUDIT.md finding 1). No + * heading is needed; only the gravity direction matters. + */ +class AndroidSensorSource(context: Context) : SensorSource { + + private val sensorManager: SensorManager? = + context.getSystemService(SensorManager::class.java) + + private val selected: Pair? = sensorManager?.let { sm -> + sm.getDefaultSensor(Sensor.TYPE_GAME_ROTATION_VECTOR) + ?.let { it to SensorSource.Kind.GAME_ROTATION_VECTOR } + ?: sm.getDefaultSensor(Sensor.TYPE_GRAVITY) + ?.let { it to SensorSource.Kind.GRAVITY } + ?: sm.getDefaultSensor(Sensor.TYPE_ACCELEROMETER) + ?.let { it to SensorSource.Kind.ACCELEROMETER } + } + + override val isAvailable: Boolean = selected != null + + override val kind: SensorSource.Kind = selected?.second ?: SensorSource.Kind.NONE + + override val gravity: Flow = if (selected == null || sensorManager == null) { + emptyFlow() + } else { + callbackFlow { + val (sensor, sensorKind) = selected + val rotationMatrix = FloatArray(9) + // Raw-accelerometer fallback only: strip linear acceleration before the + // measurement-layer EMA sees the sample. TODO(tune) against recorded traces. + var lp: Triple? = null + + val listener = object : SensorEventListener { + override fun onSensorChanged(event: SensorEvent) { + val sample = when (sensorKind) { + SensorSource.Kind.GAME_ROTATION_VECTOR -> { + SensorManager.getRotationMatrixFromVector(rotationMatrix, event.values) + // R maps device → world; world-up expressed in the device frame + // is R's third row. Scale to standard gravity. + GravitySample( + x = rotationMatrix[6] * STANDARD_GRAVITY, + y = rotationMatrix[7] * STANDARD_GRAVITY, + z = rotationMatrix[8] * STANDARD_GRAVITY, + timestampNanos = event.timestamp, + ) + } + SensorSource.Kind.GRAVITY -> GravitySample( + x = event.values[0].toDouble(), + y = event.values[1].toDouble(), + z = event.values[2].toDouble(), + timestampNanos = event.timestamp, + ) + else -> { + val prev = lp + val next = if (prev == null) { + Triple( + event.values[0].toDouble(), + event.values[1].toDouble(), + event.values[2].toDouble(), + ) + } else { + Triple( + prev.first + ACCEL_LP_ALPHA * (event.values[0] - prev.first), + prev.second + ACCEL_LP_ALPHA * (event.values[1] - prev.second), + prev.third + ACCEL_LP_ALPHA * (event.values[2] - prev.third), + ) + } + lp = next + GravitySample(next.first, next.second, next.third, event.timestamp) + } + } + trySend(sample) + } + + override fun onAccuracyChanged(sensor: Sensor?, accuracy: Int) = Unit + } + + sensorManager.registerListener(listener, sensor, SensorManager.SENSOR_DELAY_GAME) + awaitClose { sensorManager.unregisterListener(listener) } + } + } + + private companion object { + const val STANDARD_GRAVITY = 9.80665 + const val ACCEL_LP_ALPHA = 0.15 + } +} diff --git a/app/src/main/java/com/onthelevel/core/sensors/DisplayDeadband.kt b/app/src/main/java/com/onthelevel/core/sensors/DisplayDeadband.kt new file mode 100644 index 0000000..1252bbe --- /dev/null +++ b/app/src/main/java/com/onthelevel/core/sensors/DisplayDeadband.kt @@ -0,0 +1,34 @@ +package com.onthelevel.core.sensors + +import kotlin.math.abs +import kotlin.math.roundToInt + +/** + * Quantizes a stable measurement to 0.1° for display, with hysteresis so the readout + * doesn't flicker between adjacent values when the input sits on a bucket boundary + * (BRIEF.md: "0.1° resolution and a display deadband"). + * + * A displayed value of 0.1° owns the interval [0.05, 0.15]; the readout only moves + * once the input leaves that interval by more than [hysteresisMarginDegrees]. + */ +class DisplayDeadband( + private val resolutionDegrees: Double = 0.1, + private val hysteresisMarginDegrees: Double = 0.03, +) { + private var displayed: Double? = null + + fun update(stableDegrees: Double): Double { + val current = displayed + val next = if (current == null || + abs(stableDegrees - current) > resolutionDegrees / 2 + hysteresisMarginDegrees + ) { + (stableDegrees / resolutionDegrees).roundToInt() * resolutionDegrees + } else { + current + } + displayed = next + return next + } + + fun reset() { displayed = null } +} diff --git a/app/src/main/java/com/onthelevel/core/sensors/Ema.kt b/app/src/main/java/com/onthelevel/core/sensors/Ema.kt new file mode 100644 index 0000000..403f489 --- /dev/null +++ b/app/src/main/java/com/onthelevel/core/sensors/Ema.kt @@ -0,0 +1,26 @@ +package com.onthelevel.core.sensors + +import kotlin.math.exp + +/** + * Time-constant-based exponential moving average — the "stable calibrated measurement" + * filter (BRIEF.md value 2 of 3). Using a time constant instead of a fixed alpha keeps + * smoothing identical across devices with different sensor rates. + */ +class Ema(private val tauSeconds: Double) { + private var value: Double? = null + + fun update(sample: Double, dtSeconds: Double): Double { + val prev = value + val next = if (prev == null || dtSeconds <= 0.0) { + sample + } else { + val alpha = 1.0 - exp(-dtSeconds / tauSeconds) + prev + alpha * (sample - prev) + } + value = next + return next + } + + fun reset() { value = null } +} diff --git a/app/src/main/java/com/onthelevel/core/sensors/GravitySample.kt b/app/src/main/java/com/onthelevel/core/sensors/GravitySample.kt new file mode 100644 index 0000000..5b0b833 --- /dev/null +++ b/app/src/main/java/com/onthelevel/core/sensors/GravitySample.kt @@ -0,0 +1,16 @@ +package com.onthelevel.core.sensors + +/** + * Gravity (reaction) vector in the DEVICE coordinate frame, in m/s². + * Android convention: x → right edge, y → top edge, z → out of the screen. + * A phone lying screen-up on a level surface reads approximately (0, 0, +9.81). + */ +data class GravitySample( + val x: Double, + val y: Double, + val z: Double, + val timestampNanos: Long, +) + +/** The two physical orientations v1 supports (BRIEF.md). Selected manually — never auto-switched. */ +enum class LevelMode { SURFACE, EDGE } diff --git a/app/src/main/java/com/onthelevel/core/sensors/LockDetector.kt b/app/src/main/java/com/onthelevel/core/sensors/LockDetector.kt new file mode 100644 index 0000000..e0f3d83 --- /dev/null +++ b/app/src/main/java/com/onthelevel/core/sensors/LockDetector.kt @@ -0,0 +1,67 @@ +package com.onthelevel.core.sensors + +import kotlin.math.abs + +/** + * Level-lock state machine with hysteresis, dwell, and haptic debounce (BRIEF.md + * §Sensor and measurement architecture). Operates ONLY on the stable calibrated + * measurement — the same value the numeric readout shows. The lock must never + * disagree with the number on screen. + * + * Time is injected (callers pass `nowMillis`) so transitions are unit-testable. + */ +class LockDetector( + private val enterThresholdDegrees: Double = 0.2, + private val exitThresholdDegrees: Double = 0.35, + private val dwellMillis: Long = 400, + private val feedbackDebounceMillis: Long = 3_000, +) { + init { + require(exitThresholdDegrees > enterThresholdDegrees) { + "Hysteresis requires exit > enter threshold" + } + } + + data class Result( + val isLocked: Boolean, + /** True exactly once per lock acquisition, and only outside the debounce window. */ + val fireFeedback: Boolean, + ) + + private var locked = false + private var withinEnterSinceMillis: Long? = null + private var lastFeedbackAtMillis: Long? = null + + fun update(stableTiltDegrees: Double, nowMillis: Long): Result { + val magnitude = abs(stableTiltDegrees) + var fire = false + + if (!locked) { + if (magnitude <= enterThresholdDegrees) { + val since = withinEnterSinceMillis ?: nowMillis.also { withinEnterSinceMillis = it } + if (nowMillis - since >= dwellMillis) { + locked = true + val last = lastFeedbackAtMillis + if (last == null || nowMillis - last >= feedbackDebounceMillis) { + fire = true + lastFeedbackAtMillis = nowMillis + } + } + } else { + withinEnterSinceMillis = null + } + } else if (magnitude >= exitThresholdDegrees) { + locked = false + withinEnterSinceMillis = null + } + + return Result(isLocked = locked, fireFeedback = fire) + } + + fun reset() { + locked = false + withinEnterSinceMillis = null + // lastFeedbackAtMillis survives reset on purpose: switching modes must not + // defeat the haptic debounce. + } +} diff --git a/app/src/main/java/com/onthelevel/core/sensors/OrientationMath.kt b/app/src/main/java/com/onthelevel/core/sensors/OrientationMath.kt new file mode 100644 index 0000000..bbc9363 --- /dev/null +++ b/app/src/main/java/com/onthelevel/core/sensors/OrientationMath.kt @@ -0,0 +1,66 @@ +package com.onthelevel.core.sensors + +import kotlin.math.abs +import kotlin.math.acos +import kotlin.math.asin +import kotlin.math.atan2 +import kotlin.math.sqrt +import kotlin.math.tan + +/** + * Pure measurement math. No Android types — everything here is unit-testable + * with synthetic and recorded gravity vectors (BRIEF.md §Testability). + * + * Angle sign conventions (documented so calibration and UI agree): + * - Surface pitch: positive when the TOP edge of the device is higher. + * - Surface roll: positive when the RIGHT edge of the device is higher. + * - Edge level: positive when the end the device Y axis points toward is higher. + */ +object OrientationMath { + + /** Angle between gravity and the screen normal — the single honest "how far off flat" number. */ + fun surfaceTiltMagnitudeDegrees(g: GravitySample): Double { + val n = norm(g) + if (n == 0.0) return 0.0 + return Math.toDegrees(acos((g.z / n).coerceIn(-1.0, 1.0))) + } + + fun surfacePitchDegrees(g: GravitySample): Double = + Math.toDegrees(atan2(g.y, g.z)) + + fun surfaceRollDegrees(g: GravitySample): Double = + Math.toDegrees(atan2(g.x, g.z)) + + /** + * Edge mode: device standing on a long edge (gravity mostly along ±x). + * The reading is the deviation of the resting edge from horizontal — + * the component of gravity along the device Y axis. + */ + fun edgeLevelDegrees(g: GravitySample): Double { + val n = norm(g) + if (n == 0.0) return 0.0 + return Math.toDegrees(asin((g.y / n).coerceIn(-1.0, 1.0))) + } + + /** Secondary edge reading: how far the screen leans from vertical (plumb). */ + fun edgePlumbLeanDegrees(g: GravitySample): Double { + val n = norm(g) + if (n == 0.0) return 0.0 + return Math.toDegrees(asin((g.z / n).coerceIn(-1.0, 1.0))) + } + + /** + * Percent grade = tan(angle) × 100. Returns signed infinity at/beyond + * [VERTICAL_GRADE_CUTOFF_DEGREES]; UI renders that as "∞" (BRIEF.md §Angle). + */ + fun percentGrade(angleDegrees: Double): Double { + if (abs(angleDegrees) >= VERTICAL_GRADE_CUTOFF_DEGREES) { + return if (angleDegrees > 0) Double.POSITIVE_INFINITY else Double.NEGATIVE_INFINITY + } + return tan(Math.toRadians(angleDegrees)) * 100.0 + } + + const val VERTICAL_GRADE_CUTOFF_DEGREES = 89.5 + + private fun norm(g: GravitySample): Double = sqrt(g.x * g.x + g.y * g.y + g.z * g.z) +} diff --git a/app/src/main/java/com/onthelevel/core/sensors/SensorSource.kt b/app/src/main/java/com/onthelevel/core/sensors/SensorSource.kt new file mode 100644 index 0000000..d8a547d --- /dev/null +++ b/app/src/main/java/com/onthelevel/core/sensors/SensorSource.kt @@ -0,0 +1,24 @@ +package com.onthelevel.core.sensors + +import kotlinx.coroutines.flow.Flow + +/** + * The seam between Android sensor I/O and the pure measurement math. Tests inject + * fakes emitting synthetic or recorded traces (BRIEF.md §Testability). + */ +interface SensorSource { + /** False on devices with no usable tilt sensor: show the unsupported-device state. */ + val isAvailable: Boolean + + /** Which physical sensor backs [gravity]; surfaced in the header status line. */ + val kind: Kind + + /** + * Device-frame gravity stream. Cold: registering happens on collection and + * unregistering on cancellation, so lifecycle-aware collection automatically + * satisfies "sensors registered only while a relevant screen is foregrounded". + */ + val gravity: Flow + + enum class Kind { GAME_ROTATION_VECTOR, GRAVITY, ACCELEROMETER, NONE } +} diff --git a/app/src/main/java/com/onthelevel/core/sensors/TwoSampleCalibration.kt b/app/src/main/java/com/onthelevel/core/sensors/TwoSampleCalibration.kt new file mode 100644 index 0000000..f22b4d2 --- /dev/null +++ b/app/src/main/java/com/onthelevel/core/sensors/TwoSampleCalibration.kt @@ -0,0 +1,51 @@ +package com.onthelevel.core.sensors + +/** + * Two-sample (180° flip) calibration, per mode (BRIEF.md §Measurement modes and calibration). + * + * Math: the surface's true tilt is fixed in the world frame; the device's own bias is fixed + * in the device frame. After rotating the device 180° about the CONTACT-PLANE NORMAL — on the + * same, unmoved surface — the true tilt appears negated in device readings while the bias + * does not move: + * + * reading₁ = tilt + bias + * reading₂ = -tilt + bias + * ⇒ bias = (reading₁ + reading₂) / 2 + * + * This holds per axis for the small near-level angles calibration is used at. It is only + * valid if (a) the rotation is about the contact-plane normal and (b) the surface does not + * move between samples — the calibration UI must instruct exactly that. + * + * Biases are stored per mode and applied only to that mode's readings; a Surface + * calibration must never touch Edge readings (AUDIT.md finding 3). + */ +object TwoSampleCalibration { + + /** Derive one axis's fixed device bias from two readings taken 180° apart. */ + fun deriveBiasDegrees(reading1Degrees: Double, reading2Degrees: Double): Double = + (reading1Degrees + reading2Degrees) / 2.0 + + fun deriveSurface( + pitch1: Double, roll1: Double, + pitch2: Double, roll2: Double, + ): SurfaceCalibration = SurfaceCalibration( + pitchBiasDegrees = deriveBiasDegrees(pitch1, pitch2), + rollBiasDegrees = deriveBiasDegrees(roll1, roll2), + ) + + fun deriveEdge(level1: Double, level2: Double): EdgeCalibration = + EdgeCalibration(levelBiasDegrees = deriveBiasDegrees(level1, level2)) +} + +data class SurfaceCalibration(val pitchBiasDegrees: Double, val rollBiasDegrees: Double) { + fun applyToPitch(rawPitchDegrees: Double): Double = rawPitchDegrees - pitchBiasDegrees + fun applyToRoll(rawRollDegrees: Double): Double = rawRollDegrees - rollBiasDegrees + + companion object { val NONE = SurfaceCalibration(0.0, 0.0) } +} + +data class EdgeCalibration(val levelBiasDegrees: Double) { + fun applyToLevel(rawLevelDegrees: Double): Double = rawLevelDegrees - levelBiasDegrees + + companion object { val NONE = EdgeCalibration(0.0) } +} diff --git a/app/src/main/java/com/onthelevel/core/settings/SettingsRepository.kt b/app/src/main/java/com/onthelevel/core/settings/SettingsRepository.kt new file mode 100644 index 0000000..95dd7c6 --- /dev/null +++ b/app/src/main/java/com/onthelevel/core/settings/SettingsRepository.kt @@ -0,0 +1,75 @@ +package com.onthelevel.core.settings + +import android.content.Context +import androidx.datastore.core.DataStore +import androidx.datastore.preferences.core.Preferences +import androidx.datastore.preferences.core.booleanPreferencesKey +import androidx.datastore.preferences.core.doublePreferencesKey +import androidx.datastore.preferences.core.edit +import androidx.datastore.preferences.preferencesDataStore +import com.onthelevel.core.sensors.EdgeCalibration +import com.onthelevel.core.sensors.SurfaceCalibration +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.map + +private val Context.dataStore: DataStore by preferencesDataStore(name = "settings") + +/** + * DataStore-backed preferences and calibration persistence (BRIEF.md core/settings). + * Calibration is stored PER MODE and applied only to that mode's readings. + */ +class SettingsRepository(context: Context) { + + private val store = context.applicationContext.dataStore + + val surfaceCalibration: Flow = store.data.map { prefs -> + SurfaceCalibration( + pitchBiasDegrees = prefs[Keys.SURFACE_PITCH_BIAS] ?: 0.0, + rollBiasDegrees = prefs[Keys.SURFACE_ROLL_BIAS] ?: 0.0, + ) + } + + val edgeCalibration: Flow = store.data.map { prefs -> + EdgeCalibration(levelBiasDegrees = prefs[Keys.EDGE_LEVEL_BIAS] ?: 0.0) + } + + val hapticsEnabled: Flow = store.data.map { it[Keys.HAPTICS_ENABLED] ?: true } + val audioCueEnabled: Flow = store.data.map { it[Keys.AUDIO_CUE_ENABLED] ?: false } + + /** In-app reduced-motion preference; the system animator-scale signal is respected separately. */ + val reducedMotion: Flow = store.data.map { it[Keys.REDUCED_MOTION] ?: false } + + suspend fun setSurfaceCalibration(calibration: SurfaceCalibration) { + store.edit { + it[Keys.SURFACE_PITCH_BIAS] = calibration.pitchBiasDegrees + it[Keys.SURFACE_ROLL_BIAS] = calibration.rollBiasDegrees + } + } + + suspend fun setEdgeCalibration(calibration: EdgeCalibration) { + store.edit { it[Keys.EDGE_LEVEL_BIAS] = calibration.levelBiasDegrees } + } + + suspend fun setHapticsEnabled(enabled: Boolean) { + store.edit { it[Keys.HAPTICS_ENABLED] = enabled } + } + + suspend fun setAudioCueEnabled(enabled: Boolean) { + store.edit { it[Keys.AUDIO_CUE_ENABLED] = enabled } + } + + suspend fun setReducedMotion(enabled: Boolean) { + store.edit { it[Keys.REDUCED_MOTION] = enabled } + } + + // TODO(ruler): screen-ruler scale keyed by display identity/characteristics (BRIEF.md). + + private object Keys { + val SURFACE_PITCH_BIAS = doublePreferencesKey("surface_pitch_bias_deg") + val SURFACE_ROLL_BIAS = doublePreferencesKey("surface_roll_bias_deg") + val EDGE_LEVEL_BIAS = doublePreferencesKey("edge_level_bias_deg") + val HAPTICS_ENABLED = booleanPreferencesKey("haptics_enabled") + val AUDIO_CUE_ENABLED = booleanPreferencesKey("audio_cue_enabled") + val REDUCED_MOTION = booleanPreferencesKey("reduced_motion") + } +} diff --git a/app/src/main/java/com/onthelevel/feature/angle/AngleScreen.kt b/app/src/main/java/com/onthelevel/feature/angle/AngleScreen.kt new file mode 100644 index 0000000..4abed2a --- /dev/null +++ b/app/src/main/java/com/onthelevel/feature/angle/AngleScreen.kt @@ -0,0 +1,146 @@ +package com.onthelevel.feature.angle + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.input.pointer.pointerInput +import androidx.compose.ui.platform.LocalView +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import androidx.compose.foundation.gestures.detectTapGestures +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import com.onthelevel.AppContainer +import com.onthelevel.core.design.KeepScreenOn +import com.onthelevel.core.design.LevelColors +import com.onthelevel.core.sensors.Ema +import com.onthelevel.core.sensors.OrientationMath +import com.onthelevel.feature.level.formatDegrees +import com.onthelevel.feature.level.performConfirmHaptic +import kotlinx.coroutines.flow.map + +/** + * Scaffold Angle screen: live absolute/relative angle with hold-to-zero (always free). + * TODO(pro): target-angle alerts and saved named references behind the entitlement. + */ +@Composable +fun AngleScreen(container: AppContainer) { + KeepScreenOn() + + val sensorSource = container.sensorSource + if (!sensorSource.isAvailable) { + Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + Text("No usable tilt sensor on this device.", color = LevelColors.TextDim) + } + return + } + + data class AngleReading(val tilt: Double, val pitch: Double, val roll: Double) + + val readingFlow = remember { + val tiltEma = Ema(0.15) + val pitchEma = Ema(0.15) + val rollEma = Ema(0.15) + var lastNanos: Long? = null + sensorSource.gravity.map { g -> + val dt = lastNanos?.let { (g.timestampNanos - it) / 1e9 } ?: 0.0 + lastNanos = g.timestampNanos + AngleReading( + tilt = tiltEma.update(OrientationMath.surfaceTiltMagnitudeDegrees(g), dt), + pitch = pitchEma.update(OrientationMath.surfacePitchDegrees(g), dt), + roll = rollEma.update(OrientationMath.surfaceRollDegrees(g), dt), + ) + } + } + val reading by readingFlow.collectAsStateWithLifecycle(initialValue = null) + + // Relative reference: "hold to zero" (BRIEF.md §Angle — always free). + var zeroReferenceDegrees by rememberSaveable { mutableStateOf(0.0) } + val view = LocalView.current + + Column( + modifier = Modifier + .fillMaxSize() + .padding(horizontal = 24.dp, vertical = 16.dp), + ) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + ) { + Text("ANGLE", style = MaterialTheme.typography.labelSmall, color = LevelColors.TextDim) + Text( + text = if (zeroReferenceDegrees != 0.0) "RELATIVE · HOLD TO RE-ZERO" else "HOLD TO ZERO", + style = MaterialTheme.typography.labelSmall, + color = LevelColors.TextFaint, + ) + } + + Box( + modifier = Modifier + .weight(1f) + .fillMaxWidth() + .pointerInput(reading != null) { + detectTapGestures( + onLongPress = { + reading?.let { + zeroReferenceDegrees = it.tilt + view.performConfirmHaptic() + } + }, + ) + }, + contentAlignment = Alignment.Center, + ) { + Column(horizontalAlignment = Alignment.CenterHorizontally) { + Text( + text = reading?.let { formatDegrees(it.tilt - zeroReferenceDegrees) } ?: "—", + style = MaterialTheme.typography.displayLarge, + color = LevelColors.TextPrimary, + ) + if (zeroReferenceDegrees != 0.0) { + Text( + text = "zeroed at " + formatDegrees(zeroReferenceDegrees), + style = MaterialTheme.typography.labelSmall, + color = LevelColors.Amber, + textAlign = TextAlign.Center, + ) + } + } + } + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(14.dp), + ) { + SecondaryValue("PITCH", reading?.pitch?.let(::formatDegrees), Modifier.weight(1f)) + SecondaryValue("ROLL", reading?.roll?.let(::formatDegrees), Modifier.weight(1f)) + SecondaryValue("GRADE", reading?.pitch?.let { formatGrade(OrientationMath.percentGrade(it)) }, Modifier.weight(1f)) + } + } +} + +@Composable +private fun SecondaryValue(label: String, value: String?, modifier: Modifier = Modifier) { + Column(modifier = modifier) { + Text(label, style = MaterialTheme.typography.labelSmall, color = LevelColors.TextDim) + Text(value ?: "—", style = MaterialTheme.typography.headlineMedium, color = LevelColors.TextPrimary) + } +} + +private fun formatGrade(grade: Double): String = when { + grade.isInfinite() -> "∞" + else -> String.format(java.util.Locale.US, "%.1f%%", grade) +} diff --git a/app/src/main/java/com/onthelevel/feature/level/LevelPipeline.kt b/app/src/main/java/com/onthelevel/feature/level/LevelPipeline.kt new file mode 100644 index 0000000..2becd59 --- /dev/null +++ b/app/src/main/java/com/onthelevel/feature/level/LevelPipeline.kt @@ -0,0 +1,100 @@ +package com.onthelevel.feature.level + +import com.onthelevel.core.sensors.DisplayDeadband +import com.onthelevel.core.sensors.EdgeCalibration +import com.onthelevel.core.sensors.Ema +import com.onthelevel.core.sensors.GravitySample +import com.onthelevel.core.sensors.LevelMode +import com.onthelevel.core.sensors.LockDetector +import com.onthelevel.core.sensors.OrientationMath +import com.onthelevel.core.sensors.SurfaceCalibration +import kotlin.math.hypot + +/** + * One reading through the raw → stable pipeline (BRIEF.md values 1 and 2 of 3). + * Value 3 — the spring-animated display value that moves the tactile vial — is + * NOT yet implemented; this scaffold renders the deadbanded stable value directly. + */ +data class LevelReading( + val mode: LevelMode, + /** Deadbanded stable magnitude for the big readout, in degrees. */ + val displayPrimaryDegrees: Double, + /** Surface: pitch. Edge: signed level deviation. Deadbanded. */ + val secondaryADegrees: Double, + /** Surface: roll. Edge: plumb lean. Deadbanded. */ + val secondaryBDegrees: Double, + val isLocked: Boolean, + val fireFeedback: Boolean, +) + +/** + * Stateful per-collection pipeline: calibration → EMA smoothing → lock detection → + * display deadband. Created fresh when mode or calibration changes; the LockDetector + * is shared across recreations so the haptic debounce survives mode switches. + */ +class LevelPipeline( + private val mode: LevelMode, + private val surfaceCalibration: SurfaceCalibration, + private val edgeCalibration: EdgeCalibration, + private val lockDetector: LockDetector, +) { + private val emaA = Ema(SMOOTHING_TAU_SECONDS) + private val emaB = Ema(SMOOTHING_TAU_SECONDS) + private val primaryDeadband = DisplayDeadband() + private val aDeadband = DisplayDeadband() + private val bDeadband = DisplayDeadband() + private var lastTimestampNanos: Long? = null + + fun process(g: GravitySample): LevelReading { + val dtSeconds = lastTimestampNanos?.let { (g.timestampNanos - it) / 1e9 } ?: 0.0 + lastTimestampNanos = g.timestampNanos + // Sensor timestamps are monotonic; using them (not wall clock) keeps the + // lock state machine deterministic under recorded traces. + val nowMillis = g.timestampNanos / 1_000_000 + + return when (mode) { + LevelMode.SURFACE -> { + val pitch = emaA.update( + surfaceCalibration.applyToPitch(OrientationMath.surfacePitchDegrees(g)), + dtSeconds, + ) + val roll = emaB.update( + surfaceCalibration.applyToRoll(OrientationMath.surfaceRollDegrees(g)), + dtSeconds, + ) + // Near level, calibrated tilt magnitude ≈ hypot of the two calibrated + // axis angles — keeps lock detection consistent with the displayed axes. + val magnitude = hypot(pitch, roll) + val lock = lockDetector.update(magnitude, nowMillis) + LevelReading( + mode = mode, + displayPrimaryDegrees = primaryDeadband.update(magnitude), + secondaryADegrees = aDeadband.update(pitch), + secondaryBDegrees = bDeadband.update(roll), + isLocked = lock.isLocked, + fireFeedback = lock.fireFeedback, + ) + } + LevelMode.EDGE -> { + val level = emaA.update( + edgeCalibration.applyToLevel(OrientationMath.edgeLevelDegrees(g)), + dtSeconds, + ) + val lean = emaB.update(OrientationMath.edgePlumbLeanDegrees(g), dtSeconds) + val lock = lockDetector.update(level, nowMillis) + LevelReading( + mode = mode, + displayPrimaryDegrees = primaryDeadband.update(level), + secondaryADegrees = aDeadband.update(level), + secondaryBDegrees = bDeadband.update(lean), + isLocked = lock.isLocked, + fireFeedback = lock.fireFeedback, + ) + } + } + } + + private companion object { + const val SMOOTHING_TAU_SECONDS = 0.15 // TODO(tune) against recorded traces + } +} diff --git a/app/src/main/java/com/onthelevel/feature/level/LevelScreen.kt b/app/src/main/java/com/onthelevel/feature/level/LevelScreen.kt new file mode 100644 index 0000000..f982e85 --- /dev/null +++ b/app/src/main/java/com/onthelevel/feature/level/LevelScreen.kt @@ -0,0 +1,223 @@ +package com.onthelevel.feature.level + +import android.os.Build +import android.view.HapticFeedbackConstants +import android.view.View +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.Settings +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.SegmentedButton +import androidx.compose.material3.SegmentedButtonDefaults +import androidx.compose.material3.SingleChoiceSegmentedButtonRow +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalView +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import com.onthelevel.AppContainer +import com.onthelevel.core.design.KeepScreenOn +import com.onthelevel.core.design.LevelColors +import com.onthelevel.core.sensors.EdgeCalibration +import com.onthelevel.core.sensors.LevelMode +import com.onthelevel.core.sensors.LockDetector +import com.onthelevel.core.sensors.SensorSource +import com.onthelevel.core.sensors.SurfaceCalibration +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.onEach +import java.util.Locale + +/** + * Scaffold Level screen: live numbers, manual Surface|Edge selector, lock state. + * TODO(feature): the tactile cross-vial visual (spring-animated display value), + * the brief lime lock reaction, audio cue, and the calibration flow entry. + * TODO(feature): in Edge mode, counter-rotate the readout so it reads upright + * while the portrait-locked device stands on its long edge. + */ +@Composable +fun LevelScreen(container: AppContainer) { + KeepScreenOn() + + val sensorSource = container.sensorSource + if (!sensorSource.isAvailable) { + UnsupportedDeviceMessage() + return + } + + var mode by rememberSaveable { mutableStateOf(LevelMode.SURFACE) } + val surfaceCal by container.settings.surfaceCalibration + .collectAsStateWithLifecycle(initialValue = SurfaceCalibration.NONE) + val edgeCal by container.settings.edgeCalibration + .collectAsStateWithLifecycle(initialValue = EdgeCalibration.NONE) + val hapticsEnabled by container.settings.hapticsEnabled + .collectAsStateWithLifecycle(initialValue = true) + + val view = LocalView.current + val lockDetector = remember { LockDetector() } + LaunchedEffect(mode) { lockDetector.reset() } + + val readingFlow = remember(mode, surfaceCal, edgeCal, hapticsEnabled, view) { + val pipeline = LevelPipeline(mode, surfaceCal, edgeCal, lockDetector) + sensorSource.gravity + .map { pipeline.process(it) } + .onEach { if (it.fireFeedback && hapticsEnabled) view.performConfirmHaptic() } + } + val reading by readingFlow.collectAsStateWithLifecycle(initialValue = null) + + val isLocked = reading?.isLocked == true + val isCalibrated = when (mode) { + LevelMode.SURFACE -> surfaceCal != SurfaceCalibration.NONE + LevelMode.EDGE -> edgeCal != EdgeCalibration.NONE + } + + Column( + modifier = Modifier + .fillMaxSize() + .padding(horizontal = 24.dp, vertical = 16.dp), + ) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically, + ) { + Column { + Text("LEVEL", style = MaterialTheme.typography.labelSmall, color = LevelColors.TextDim) + Text( + text = statusLine(isCalibrated, sensorSource.kind), + style = MaterialTheme.typography.labelSmall, + color = if (isCalibrated) LevelColors.LimeLock else LevelColors.TextFaint, + ) + } + IconButton(onClick = { /* TODO(feature): calibration & settings entry */ }) { + Icon( + Icons.Outlined.Settings, + contentDescription = "Calibration and settings", + tint = LevelColors.TextDim, + ) + } + } + + SingleChoiceSegmentedButtonRow(modifier = Modifier.fillMaxWidth().padding(top = 12.dp)) { + LevelMode.entries.forEachIndexed { index, entry -> + SegmentedButton( + selected = mode == entry, + onClick = { mode = entry }, + shape = SegmentedButtonDefaults.itemShape(index = index, count = LevelMode.entries.size), + ) { + Text(if (entry == LevelMode.SURFACE) "Surface" else "Edge") + } + } + } + + Box( + modifier = Modifier + .weight(1f) + .fillMaxWidth(), + contentAlignment = Alignment.Center, + ) { + Column(horizontalAlignment = Alignment.CenterHorizontally) { + Text( + text = reading?.let { formatDegrees(it.displayPrimaryDegrees) } ?: "—", + style = MaterialTheme.typography.displayLarge, + color = if (isLocked) LevelColors.LimeLock else LevelColors.TextPrimary, + ) + // Lock state is announced with a label, never color alone (BRIEF.md). + Text( + text = when { + isLocked && mode == LevelMode.SURFACE -> "Surface is flat" + isLocked -> "Edge is level" + else -> "" + }, + style = MaterialTheme.typography.headlineMedium, + color = LevelColors.LimeLockText, + textAlign = TextAlign.Center, + ) + } + } + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(14.dp), + ) { + ValuePanel( + label = if (mode == LevelMode.SURFACE) "PITCH" else "LEVEL", + value = reading?.secondaryADegrees, + modifier = Modifier.weight(1f), + ) + ValuePanel( + label = if (mode == LevelMode.SURFACE) "ROLL" else "LEAN", + value = reading?.secondaryBDegrees, + modifier = Modifier.weight(1f), + ) + } + } +} + +@Composable +private fun ValuePanel(label: String, value: Double?, modifier: Modifier = Modifier) { + Surface( + modifier = modifier, + color = LevelColors.Panel, + contentColor = LevelColors.TextPrimary, + shape = MaterialTheme.shapes.large, + ) { + Column(modifier = Modifier.padding(16.dp)) { + Text(label, style = MaterialTheme.typography.labelSmall, color = LevelColors.TextDim) + Text( + text = value?.let { formatDegrees(it) } ?: "—", + style = MaterialTheme.typography.headlineMedium, + ) + } + } +} + +@Composable +private fun UnsupportedDeviceMessage() { + Box(modifier = Modifier.fillMaxSize().padding(32.dp), contentAlignment = Alignment.Center) { + Text( + text = "This device has no usable tilt sensor, so On the Level can't take measurements here.", + style = MaterialTheme.typography.headlineMedium, + textAlign = TextAlign.Center, + color = LevelColors.TextDim, + ) + } +} + +private fun statusLine(isCalibrated: Boolean, kind: SensorSource.Kind): String { + val source = when (kind) { + SensorSource.Kind.GAME_ROTATION_VECTOR -> "fused" + SensorSource.Kind.GRAVITY -> "gravity" + SensorSource.Kind.ACCELEROMETER -> "accelerometer" + SensorSource.Kind.NONE -> "no sensor" + } + return (if (isCalibrated) "calibrated" else "live") + " · " + source +} + +internal fun formatDegrees(value: Double): String = String.format(Locale.US, "%.1f°", value) + +internal fun View.performConfirmHaptic() { + val constant = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { + HapticFeedbackConstants.CONFIRM + } else { + HapticFeedbackConstants.VIRTUAL_KEY + } + performHapticFeedback(constant) +} diff --git a/app/src/main/java/com/onthelevel/feature/ruler/RulerScreen.kt b/app/src/main/java/com/onthelevel/feature/ruler/RulerScreen.kt new file mode 100644 index 0000000..39330a6 --- /dev/null +++ b/app/src/main/java/com/onthelevel/feature/ruler/RulerScreen.kt @@ -0,0 +1,55 @@ +package com.onthelevel.feature.ruler + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import com.onthelevel.AppContainer +import com.onthelevel.core.design.LevelColors + +/** + * Scaffold Screen Ruler: Pro preview only (BRIEF.md §Tools — calm, intentional + * paywall; never an interruption in the free level/angle flow). + * TODO(pro): guided calibration (credit-card 85.60 mm + conventional ruler), + * scale stored per display identity, recalibration prompt on material display change. + */ +@Composable +fun RulerScreen(container: AppContainer) { + val entitlement by container.entitlement.entitlement.collectAsStateWithLifecycle() + + Column( + modifier = Modifier + .fillMaxSize() + .padding(32.dp), + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Text("SCREEN RULER", style = MaterialTheme.typography.labelSmall, color = LevelColors.TextDim) + Text( + text = if (entitlement.isPro) { + "Ruler coming in the feature build." + } else { + "The calibrated screen ruler is part of On the Level Pro." + }, + style = MaterialTheme.typography.headlineMedium, + textAlign = TextAlign.Center, + modifier = Modifier.padding(top = 12.dp), + ) + Text( + text = "For short, rough measurements only — not a substitute for a tape measure.", + style = MaterialTheme.typography.labelSmall, + color = LevelColors.TextDim, + textAlign = TextAlign.Center, + modifier = Modifier.padding(top = 16.dp), + ) + } +} diff --git a/app/src/main/java/com/onthelevel/feature/tools/ToolsScreen.kt b/app/src/main/java/com/onthelevel/feature/tools/ToolsScreen.kt new file mode 100644 index 0000000..d99bc01 --- /dev/null +++ b/app/src/main/java/com/onthelevel/feature/tools/ToolsScreen.kt @@ -0,0 +1,82 @@ +package com.onthelevel.feature.tools + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import com.onthelevel.core.design.LevelColors + +@Composable +fun ToolsScreen(onOpenRuler: () -> Unit) { + Column( + modifier = Modifier + .fillMaxSize() + .padding(24.dp), + verticalArrangement = Arrangement.spacedBy(14.dp), + ) { + Text("TOOLS", style = MaterialTheme.typography.labelSmall, color = LevelColors.TextDim) + + ToolCard( + title = "Screen Ruler", + subtitle = "Rough on-screen measuring", + badge = "PRO", + onClick = onOpenRuler, + ) + ToolCard( + title = "Calibration", + subtitle = "Two-sample level calibration — coming with the feature build", + onClick = { /* TODO(feature): guided calibration flow */ }, + ) + ToolCard( + title = "Units & Feedback", + subtitle = "Haptics, audio cue, reduced motion — coming with the feature build", + onClick = { /* TODO(feature): preferences UI over SettingsRepository */ }, + ) + } +} + +@Composable +private fun ToolCard( + title: String, + subtitle: String, + badge: String? = null, + onClick: () -> Unit, +) { + Surface( + modifier = Modifier + .fillMaxWidth() + .clickable(onClick = onClick), + color = LevelColors.Panel, + contentColor = LevelColors.TextPrimary, + shape = MaterialTheme.shapes.large, + ) { + Column(modifier = Modifier.padding(18.dp)) { + Row(verticalAlignment = Alignment.CenterVertically) { + Text(title, style = MaterialTheme.typography.headlineMedium) + if (badge != null) { + Text( + text = " $badge", + style = MaterialTheme.typography.labelSmall, + color = LevelColors.Amber, + ) + } + } + Text( + text = subtitle, + style = MaterialTheme.typography.labelSmall, + color = LevelColors.TextDim, + modifier = Modifier.padding(top = 6.dp), + ) + } + } +} diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..af905a2 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,23 @@ + + + + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..b51695c --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..d780da5 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,5 @@ + + + #FF0A0A0B + #FFFFC44E + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..4727085 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,4 @@ + + + On the Level + diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..b751d39 --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/app/src/test/java/com/onthelevel/core/sensors/DisplayDeadbandTest.kt b/app/src/test/java/com/onthelevel/core/sensors/DisplayDeadbandTest.kt new file mode 100644 index 0000000..3682842 --- /dev/null +++ b/app/src/test/java/com/onthelevel/core/sensors/DisplayDeadbandTest.kt @@ -0,0 +1,30 @@ +package com.onthelevel.core.sensors + +import org.junit.Assert.assertEquals +import org.junit.Test + +class DisplayDeadbandTest { + + @Test + fun `quantizes to tenths of a degree`() { + val band = DisplayDeadband() + assertEquals(0.1, band.update(0.14), 1e-9) + } + + @Test + fun `noise on a boundary does not flicker the readout`() { + val band = DisplayDeadband() + val first = band.update(0.05) // boundary between 0.0 and 0.1 + // Jitter of ±0.02° around the boundary must hold the displayed value. + assertEquals(first, band.update(0.06), 1e-9) + assertEquals(first, band.update(0.04), 1e-9) + assertEquals(first, band.update(0.05), 1e-9) + } + + @Test + fun `a real change moves the readout`() { + val band = DisplayDeadband() + band.update(0.0) + assertEquals(0.2, band.update(0.2), 1e-9) + } +} diff --git a/app/src/test/java/com/onthelevel/core/sensors/EmaTest.kt b/app/src/test/java/com/onthelevel/core/sensors/EmaTest.kt new file mode 100644 index 0000000..f6aaad7 --- /dev/null +++ b/app/src/test/java/com/onthelevel/core/sensors/EmaTest.kt @@ -0,0 +1,42 @@ +package com.onthelevel.core.sensors + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Test + +class EmaTest { + + @Test + fun `first sample passes through unfiltered`() { + assertEquals(5.0, Ema(0.15).update(5.0, 0.0), 1e-9) + } + + @Test + fun `converges toward a constant input`() { + val ema = Ema(0.15) + ema.update(0.0, 0.0) + var value = 0.0 + repeat(100) { value = ema.update(10.0, 0.02) } + assertEquals(10.0, value, 1e-3) + } + + @Test + fun `one time constant covers ~63 percent of a step`() { + val ema = Ema(1.0) + ema.update(0.0, 0.0) + val afterOneTau = ema.update(1.0, 1.0) + assertEquals(0.632, afterOneTau, 0.01) + } + + @Test + fun `same elapsed time yields same smoothing regardless of sample rate`() { + val fast = Ema(0.5) + val slow = Ema(0.5) + fast.update(0.0, 0.0) + slow.update(0.0, 0.0) + var fastValue = 0.0 + repeat(10) { fastValue = fast.update(1.0, 0.01) } // 100 ms in 10 steps + val slowValue = slow.update(1.0, 0.1) // 100 ms in 1 step + assertTrue(kotlin.math.abs(fastValue - slowValue) < 0.02) + } +} diff --git a/app/src/test/java/com/onthelevel/core/sensors/LockDetectorTest.kt b/app/src/test/java/com/onthelevel/core/sensors/LockDetectorTest.kt new file mode 100644 index 0000000..c639dc6 --- /dev/null +++ b/app/src/test/java/com/onthelevel/core/sensors/LockDetectorTest.kt @@ -0,0 +1,73 @@ +package com.onthelevel.core.sensors + +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class LockDetectorTest { + + private fun detector() = LockDetector( + enterThresholdDegrees = 0.2, + exitThresholdDegrees = 0.35, + dwellMillis = 400, + feedbackDebounceMillis = 3_000, + ) + + @Test + fun `lock requires dwell time inside the enter threshold`() { + val d = detector() + assertFalse(d.update(0.1, 0).isLocked) + assertFalse(d.update(0.1, 200).isLocked) + val result = d.update(0.1, 450) + assertTrue(result.isLocked) + assertTrue(result.fireFeedback) + } + + @Test + fun `leaving the threshold before dwell completes resets the timer`() { + val d = detector() + d.update(0.1, 0) + d.update(0.5, 200) // bounced out + d.update(0.1, 300) // back in — dwell restarts + assertFalse(d.update(0.1, 600).isLocked) // only 300ms since re-entry + assertTrue(d.update(0.1, 750).isLocked) + } + + @Test + fun `hysteresis holds the lock between enter and exit thresholds`() { + val d = detector() + d.update(0.1, 0) + assertTrue(d.update(0.1, 500).isLocked) + // 0.3° is above enter (0.2) but below exit (0.35): still locked. + assertTrue(d.update(0.3, 600).isLocked) + // 0.4° exceeds the exit threshold: unlocked. + assertFalse(d.update(0.4, 700).isLocked) + } + + @Test + fun `feedback fires once per lock and respects the debounce window`() { + val d = detector() + d.update(0.1, 0) + assertTrue(d.update(0.1, 500).fireFeedback) + assertFalse(d.update(0.1, 600).fireFeedback) // still locked, no re-fire + + // Rock out and back in quickly: re-lock at ~1500ms is inside the 3s debounce. + d.update(0.5, 900) + d.update(0.1, 1000) + val relock = d.update(0.1, 1500) + assertTrue(relock.isLocked) + assertFalse(relock.fireFeedback) + + // A re-lock after the debounce window fires again. + d.update(0.5, 2000) + d.update(0.1, 4000) + assertTrue(d.update(0.1, 4500).fireFeedback) + } + + @Test + fun `negative readings lock on magnitude`() { + val d = detector() + d.update(-0.1, 0) + assertTrue(d.update(-0.1, 500).isLocked) + } +} diff --git a/app/src/test/java/com/onthelevel/core/sensors/OrientationMathTest.kt b/app/src/test/java/com/onthelevel/core/sensors/OrientationMathTest.kt new file mode 100644 index 0000000..1558ef1 --- /dev/null +++ b/app/src/test/java/com/onthelevel/core/sensors/OrientationMathTest.kt @@ -0,0 +1,85 @@ +package com.onthelevel.core.sensors + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Test +import kotlin.math.cos +import kotlin.math.sin + +class OrientationMathTest { + + private val g = 9.80665 + + private fun flat() = GravitySample(0.0, 0.0, g, 0) + + /** Device tilted so the top edge is raised by [degrees] (rotation about the X axis). */ + private fun pitched(degrees: Double): GravitySample { + val r = Math.toRadians(degrees) + return GravitySample(0.0, g * sin(r), g * cos(r), 0) + } + + /** Device tilted so the right edge is raised by [degrees] (rotation about the Y axis). */ + private fun rolled(degrees: Double): GravitySample { + val r = Math.toRadians(degrees) + return GravitySample(g * sin(r), 0.0, g * cos(r), 0) + } + + /** Device standing on its long edge, tipped in the wall plane by [degrees]. */ + private fun onEdge(tipDegrees: Double): GravitySample { + val r = Math.toRadians(tipDegrees) + return GravitySample(g * cos(r), g * sin(r), 0.0, 0) + } + + @Test + fun `flat device reads zero everywhere in surface mode`() { + assertEquals(0.0, OrientationMath.surfaceTiltMagnitudeDegrees(flat()), 1e-9) + assertEquals(0.0, OrientationMath.surfacePitchDegrees(flat()), 1e-9) + assertEquals(0.0, OrientationMath.surfaceRollDegrees(flat()), 1e-9) + } + + @Test + fun `pitch recovers the applied rotation with correct sign`() { + assertEquals(1.0, OrientationMath.surfacePitchDegrees(pitched(1.0)), 1e-9) + assertEquals(-2.5, OrientationMath.surfacePitchDegrees(pitched(-2.5)), 1e-9) + assertEquals(0.0, OrientationMath.surfaceRollDegrees(pitched(1.0)), 1e-9) + } + + @Test + fun `roll recovers the applied rotation with correct sign`() { + assertEquals(3.0, OrientationMath.surfaceRollDegrees(rolled(3.0)), 1e-9) + assertEquals(0.0, OrientationMath.surfacePitchDegrees(rolled(3.0)), 1e-9) + } + + @Test + fun `tilt magnitude matches single-axis rotations`() { + assertEquals(1.0, OrientationMath.surfaceTiltMagnitudeDegrees(pitched(1.0)), 1e-9) + assertEquals(4.0, OrientationMath.surfaceTiltMagnitudeDegrees(rolled(4.0)), 1e-9) + } + + @Test + fun `edge mode reads zero when the long edge is horizontal`() { + assertEquals(0.0, OrientationMath.edgeLevelDegrees(onEdge(0.0)), 1e-9) + assertEquals(0.0, OrientationMath.edgePlumbLeanDegrees(onEdge(0.0)), 1e-9) + } + + @Test + fun `edge mode recovers in-plane tip with correct sign`() { + assertEquals(1.5, OrientationMath.edgeLevelDegrees(onEdge(1.5)), 1e-9) + assertEquals(-2.0, OrientationMath.edgeLevelDegrees(onEdge(-2.0)), 1e-9) + } + + @Test + fun `percent grade is tan-based and capped to infinity near vertical`() { + assertEquals(0.0, OrientationMath.percentGrade(0.0), 1e-9) + assertEquals(100.0, OrientationMath.percentGrade(45.0), 1e-6) + assertTrue(OrientationMath.percentGrade(89.6).isInfinite()) + assertTrue(OrientationMath.percentGrade(-89.6) == Double.NEGATIVE_INFINITY) + } + + @Test + fun `zero vector does not produce NaN`() { + val zero = GravitySample(0.0, 0.0, 0.0, 0) + assertEquals(0.0, OrientationMath.surfaceTiltMagnitudeDegrees(zero), 1e-9) + assertEquals(0.0, OrientationMath.edgeLevelDegrees(zero), 1e-9) + } +} diff --git a/app/src/test/java/com/onthelevel/core/sensors/TwoSampleCalibrationTest.kt b/app/src/test/java/com/onthelevel/core/sensors/TwoSampleCalibrationTest.kt new file mode 100644 index 0000000..0632caa --- /dev/null +++ b/app/src/test/java/com/onthelevel/core/sensors/TwoSampleCalibrationTest.kt @@ -0,0 +1,47 @@ +package com.onthelevel.core.sensors + +import org.junit.Assert.assertEquals +import org.junit.Test + +class TwoSampleCalibrationTest { + + @Test + fun `flip cancels true tilt and isolates device bias`() { + // Surface truly tilted 0.5°, device bias +0.3°: + val reading1 = 0.5 + 0.3 // as placed + val reading2 = -0.5 + 0.3 // after 180° rotation about the surface normal + val bias = TwoSampleCalibration.deriveBiasDegrees(reading1, reading2) + assertEquals(0.3, bias, 1e-9) + // Applying the bias recovers the true tilt from the original reading: + assertEquals(0.5, reading1 - bias, 1e-9) + } + + @Test + fun `surface calibration derives both axes independently`() { + val cal = TwoSampleCalibration.deriveSurface( + pitch1 = 0.8, roll1 = -0.1, + pitch2 = -0.2, roll2 = 0.5, + ) + assertEquals(0.3, cal.pitchBiasDegrees, 1e-9) + assertEquals(0.2, cal.rollBiasDegrees, 1e-9) + assertEquals(0.5, cal.applyToPitch(0.8), 1e-9) + assertEquals(-0.3, cal.applyToRoll(-0.1), 1e-9) + } + + @Test + fun `unbiased device on a level surface derives zero bias`() { + val cal = TwoSampleCalibration.deriveEdge(0.0, 0.0) + assertEquals(0.0, cal.levelBiasDegrees, 1e-9) + assertEquals(1.2, cal.applyToLevel(1.2), 1e-9) + } + + @Test + fun `surface and edge calibrations are independent types applied per mode`() { + val surface = TwoSampleCalibration.deriveSurface(1.0, 1.0, 0.0, 0.0) + val edge = EdgeCalibration.NONE + // An edge reading passed through the untouched edge calibration is unchanged, + // regardless of surface calibration state (AUDIT.md finding 3). + assertEquals(0.7, edge.applyToLevel(0.7), 1e-9) + assertEquals(0.5, surface.pitchBiasDegrees, 1e-9) + } +} diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..020183f --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,4 @@ +plugins { + alias(libs.plugins.android.application) apply false + alias(libs.plugins.kotlin.compose) apply false +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..f0a2e55 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,4 @@ +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +android.useAndroidX=true +kotlin.code.style=official +android.nonTransitiveRClass=true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..981073b --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,42 @@ +[versions] +agp = "9.2.1" +kotlin = "2.2.10" +coreKtx = "1.18.0" +activityCompose = "1.10.1" +lifecycle = "2.8.7" +composeBom = "2025.06.01" +navigation = "2.8.4" +datastore = "1.1.6" +billing = "9.1.0" +junit = "4.13.2" +coroutinesTest = "1.9.0" +androidxJunit = "1.3.0" +espresso = "3.7.0" + +[libraries] +androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } +androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" } +androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycle" } +androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "lifecycle" } +androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycle" } + +androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } +androidx-compose-ui = { group = "androidx.compose.ui", name = "ui" } +androidx-compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } +androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } +androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } +androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" } +androidx-compose-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended" } + +androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigation" } +androidx-datastore-preferences = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "datastore" } +billing-ktx = { group = "com.android.billingclient", name = "billing-ktx", version.ref = "billing" } + +junit = { group = "junit", name = "junit", version.ref = "junit" } +kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutinesTest" } +androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidxJunit" } +androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso" } + +[plugins] +android-application = { id = "com.android.application", version.ref = "agp" } +kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..8bdaf60c75ab801e22807dde59e12a8735a34077 GIT binary patch literal 45457 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 c82=K%QXLKFx%@O{wJjEi6Y56o#$)Bpeg literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..8e61ef1 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,8 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionSha256Sum=2ab2958f2a1e51120c326cad6f385153bb11ee93b3c216c5fccebfdfbb7ec6cb +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..ef07e01 --- /dev/null +++ b/gradlew @@ -0,0 +1,251 @@ +#!/bin/sh + +# +# Copyright © 2015 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/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 + +CLASSPATH="\\\"\\\"" + + +# 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" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + 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" \ + -classpath "$CLASSPATH" \ + -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/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..5eed7ee --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..b018b1b --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,26 @@ +pluginManagement { + repositories { + google { + content { + includeGroupByRegex("com\\.android.*") + includeGroupByRegex("com\\.google.*") + includeGroupByRegex("androidx.*") + } + } + mavenCentral() + gradlePluginPortal() + } +} +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} + +rootProject.name = "OnTheLevel" +include(":app")