Cleaned up merge UI, added reset step button
This commit is contained in:
@@ -133,6 +133,7 @@ class BowlingCameraActivity : AppCompatActivity(), CameraXController.Callback {
|
||||
startActivity(Intent(this, ParameterEditorActivity::class.java))
|
||||
}
|
||||
}
|
||||
binding.btnResetCounter.setOnClickListener { viewModel.resetStepCounter() }
|
||||
|
||||
observeViewModel()
|
||||
|
||||
@@ -243,7 +244,8 @@ class BowlingCameraActivity : AppCompatActivity(), CameraXController.Callback {
|
||||
// detection is actually seeing each footfall while
|
||||
// testing/tuning it, rather than only finding out at
|
||||
// step 5 that earlier steps were silently missed.
|
||||
if (events.isEmpty()) {
|
||||
val isRecording = viewModel.recordingState.value is CameraViewModel.RecordingState.Recording
|
||||
if (events.isEmpty() || !isRecording) {
|
||||
binding.textFinalPosition.visibility = View.GONE
|
||||
} else {
|
||||
val reachedFinal = events.size >= FINAL_STEP_COUNT
|
||||
@@ -264,8 +266,9 @@ class BowlingCameraActivity : AppCompatActivity(), CameraXController.Callback {
|
||||
}
|
||||
launch {
|
||||
viewModel.poseStageFeedback.collect { feedback ->
|
||||
val isRecording = viewModel.recordingState.value is CameraViewModel.RecordingState.Recording
|
||||
binding.textPoseStageFeedback.text = feedback
|
||||
binding.textPoseStageFeedback.visibility = if (feedback != null) View.VISIBLE else View.GONE
|
||||
binding.textPoseStageFeedback.visibility = if ((feedback != null && isRecording)) View.VISIBLE else View.GONE
|
||||
}
|
||||
}
|
||||
// Deliberately its own collector, independent of stepEvents
|
||||
@@ -314,6 +317,8 @@ class BowlingCameraActivity : AppCompatActivity(), CameraXController.Callback {
|
||||
is CameraViewModel.RecordingState.Idle -> {
|
||||
binding.layoutRecordingIndicator.visibility = View.GONE
|
||||
stepCounterUi.setVisible(visible = false)
|
||||
binding.textFinalPosition.visibility = View.GONE
|
||||
binding.textPoseStageFeedback.visibility = View.GONE
|
||||
binding.btnRecord.isEnabled = true
|
||||
binding.btnRecord.setText(R.string.record)
|
||||
// Pose mode can only be changed between recordings, not
|
||||
|
||||
Reference in New Issue
Block a user