resolve merge

2026-09-08 10:31:35 +08:00
parent 4bb692e543
commit ddd86ba322
4 changed files with 9 additions and 6 deletions
@@ -126,12 +126,13 @@
        app:layout_constraintEnd_toEndOf="parent"
        android:layout_marginTop="4dp"
        android:layout_marginEnd="16dp" />
+        
 <!--    to only show when recording-->
    <Button
        android:id="@+id/btn_show_step"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:text="@string/starting_position"
+        android:text="@string/pose_phase_waiting"
        android:layout_marginBottom="128dp"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"