Cleaned up merge UI, added reset step button
This commit is contained in:
@@ -75,25 +75,6 @@
|
||||
android:fontFamily="monospace" />
|
||||
</LinearLayout>
|
||||
|
||||
<!-- Top Left: Body Angles Readout (below Recording Indicator / Back Button) -->
|
||||
<TextView
|
||||
android:id="@+id/text_pose_metrics"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/overlay_scrim"
|
||||
android:paddingHorizontal="8dp"
|
||||
android:paddingVertical="4dp"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="12sp"
|
||||
android:fontFamily="monospace"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible"
|
||||
tools:text="Torso: 12° · Knee L: 168° R: 170° Elbow L: 85° R: 90°"
|
||||
app:layout_constraintTop_toBottomOf="@id/layout_recording_indicator"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginStart="16dp" />
|
||||
|
||||
<!-- Top Right Controls: Switch Camera & Settings Editor -->
|
||||
<Button
|
||||
android:id="@+id/btn_switch_camera"
|
||||
@@ -128,18 +109,18 @@
|
||||
android:textStyle="bold"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible"
|
||||
tools:text="Get into starting stance"
|
||||
tools:text="Starting Stance"
|
||||
app:layout_constraintTop_toBottomOf="@id/btn_editor"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginTop="16dp"
|
||||
android:layout_marginEnd="16dp" />
|
||||
|
||||
<!-- TOP MIDDLE: Step Counter Card (Primary Retained Element) -->
|
||||
<!-- TOP MIDDLE: Step Counter Card (Positioned below top controls) -->
|
||||
<LinearLayout
|
||||
android:id="@+id/card_step_counter"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="56dp"
|
||||
android:layout_marginTop="104dp"
|
||||
android:orientation="vertical"
|
||||
android:gravity="center"
|
||||
android:background="@drawable/shape_step_counter_card"
|
||||
@@ -170,16 +151,17 @@
|
||||
android:textStyle="bold" />
|
||||
</LinearLayout>
|
||||
|
||||
<!-- CENTERED BELOW STEP COUNTER: Final Position & Live Coaching Cue -->
|
||||
<!-- CENTERED BELOW STEP COUNTER: Final Position & Live Coaching Cue
|
||||
(Anchored to parent so it doesn't jump to the top of the screen when step counter becomes GONE) -->
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:gravity="center_horizontal"
|
||||
app:layout_constraintTop_toBottomOf="@id/card_step_counter"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
android:layout_marginTop="8dp">
|
||||
android:layout_marginTop="176dp">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/text_final_position"
|
||||
@@ -210,6 +192,25 @@
|
||||
tools:visibility="visible" />
|
||||
</LinearLayout>
|
||||
|
||||
<!-- Bottom Left: Body Angles Readout (above Pose Switch) -->
|
||||
<TextView
|
||||
android:id="@+id/text_pose_metrics"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/overlay_scrim"
|
||||
android:paddingHorizontal="8dp"
|
||||
android:paddingVertical="4dp"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="12sp"
|
||||
android:fontFamily="monospace"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible"
|
||||
tools:text="Torso: 12° · Knee L: 168° R: 170° Elbow L: 85° R: 90°"
|
||||
app:layout_constraintBottom_toTopOf="@id/switch_pose"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
android:layout_marginBottom="12dp"
|
||||
android:layout_marginStart="16dp" />
|
||||
|
||||
<!-- BOTTOM CONTROLS: Pose Overlay Switch & Record Button -->
|
||||
<com.google.android.material.switchmaterial.SwitchMaterial
|
||||
android:id="@+id/switch_pose"
|
||||
@@ -233,6 +234,17 @@
|
||||
android:text="@string/record"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@id/switch_pose"
|
||||
app:layout_constraintEnd_toStartOf="@id/btn_reset_counter" />
|
||||
|
||||
<!-- Bottom Right: Manual Reset Step Counter Button -->
|
||||
<Button
|
||||
android:id="@+id/btn_reset_counter"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:layout_marginBottom="24dp"
|
||||
android:text="@string/reset_counter"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent" />
|
||||
|
||||
<!-- Permission Rationale Screen -->
|
||||
|
||||
Reference in New Issue
Block a user