Fix Merge, cleaned up UI

app/src/main/java/com/example/jnicpp/bowling/StepCountingSession.kt

@@ -43,22 +43,12 @@ class StepCountingSession {
     /** @brief Time-ordered pose samples buffered for the current/most recent recording session. */
     val poseFrames: List<PoseFrame> get() = poseFrameBuffer
 
-    // Steps detected so far in the current attempt (since the last reset,
-    // whether that reset was a new session starting or the bowler
-    // completing the hand-raise reset gesture mid-recording). The UI reads
-    // events.size as the "Step N" counter. Stays populated after recording
-    // stops so the last attempt's count remains visible.
+    // Steps detected so far in the current attempt (since the last reset).
+    // The UI reads events.size as the "Step N" counter.
     private val _stepEvents = MutableStateFlow<List<StepEvent>>(emptyList())
     /** @brief Steps detected so far in the current attempt, since the last reset. */
     val stepEvents: StateFlow<List<StepEvent>> = _stepEvents.asStateFlow()
 
-    // How far through the hold-to-reset gesture the bowler currently is --
-    // see LiveStepDetector.Result.handRaiseProgress. Drives the on-screen
-    // hold indicator so a reset is never a surprise; 0 whenever not recording.
-    private val _handRaiseProgress = MutableStateFlow(0f)
-    /** @brief Progress toward the hold-to-reset gesture, from 0 to 1. */
-    val handRaiseProgress: StateFlow<Float> = _handRaiseProgress.asStateFlow()
-
     /**
      * @brief Feeds one analyzed frame's landmarks/angles into buffering and
      *        live step counting. Only meant to be called while a recording
@@ -66,8 +56,14 @@ class StepCountingSession {
      * @param landmarks EMA-smoothed landmarks for this frame, keyed by ML Kit's `PoseLandmark` type constant.
      * @param angles Joint angles computed for this same frame.
      * @param timestampMs Wall-clock time this frame was analyzed, in milliseconds.
+     * @param isStartingPosition Whether the bowler is currently in the starting position.
      */
-    fun onFrame(landmarks: Map<Int, SmoothedLandmark>, angles: PoseAngles, timestampMs: Long) {
+    fun onFrame(
+        landmarks: Map<Int, SmoothedLandmark>,
+        angles: PoseAngles,
+        timestampMs: Long,
+        isStartingPosition: Boolean = false
+    ) {
         val smoothedAnkleHip = ankleHipSmoother.smooth(landmarks)
         val frame = buildPoseFrame(
             timestampMs = timestampMs,
@@ -77,14 +73,13 @@ class StepCountingSession {
         )
         poseFrameBuffer.add(frame)
 
-        val result = liveStepDetector.update(frame)
+        val result = liveStepDetector.update(frame, isStartingPosition = isStartingPosition)
         if (result.wasReset) {
             _stepEvents.value = emptyList()
         }
         if (result.newSteps.isNotEmpty()) {
             _stepEvents.value = _stepEvents.value + result.newSteps
         }
-        _handRaiseProgress.value = result.handRaiseProgress
     }
 
     /**
@@ -98,11 +93,8 @@ class StepCountingSession {
         liveStepDetector = LiveStepDetector(
             minSpacingMs = settings.minSpacingMs,
             minProminenceRatio = settings.minProminenceRatio,
-            maxFrameJumpRatio = settings.maxFrameJumpRatio,
-            handRaiseHoldMs = settings.handRaiseHoldMs,
-            handRaiseMarginRatio = settings.handRaiseMarginRatio
+            maxFrameJumpRatio = settings.maxFrameJumpRatio
         )
         _stepEvents.value = emptyList()
-        _handRaiseProgress.value = 0f
     }
 }