diff options
| author | Peter Stone <thepeterstone@gmail.com> | 2026-04-02 21:53:08 +0000 |
|---|---|---|
| committer | Peter Stone <thepeterstone@gmail.com> | 2026-04-02 21:53:08 +0000 |
| commit | 2e0c420020526873906fedd024b50baef56011fa (patch) | |
| tree | fe3ab60fc7960ec01800325d544805217ffaf4e9 | |
| parent | e68212991935d33a4baca77d88cd20a82fbcf6a6 (diff) | |
fix(ui): anchor both FABs to instrument sheet (squash merge recovery)
Both fab_mob and fab_record_track now anchor to instrument_bottom_sheet
so they sit above the sheet peek zone rather than being occluded by
the sheet's 16dp elevation. Resolves stash conflict in settings.local.json.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
| -rw-r--r-- | .claude/settings.local.json | 4 | ||||
| -rw-r--r-- | android-app/app/src/main/res/layout/activity_main.xml | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/.claude/settings.local.json b/.claude/settings.local.json index bcb3577..4fe9a49 100644 --- a/.claude/settings.local.json +++ b/.claude/settings.local.json @@ -57,7 +57,9 @@ "Bash(screen -list)", "Bash(adb logcat:*)", "Bash(grep -v \"^--$\")", - "Bash(./gradlew assembleDebug)" + "Bash(./gradlew assembleDebug)", + "Skill(commit-commands:commit-push-pr)", + "Skill(code-review:code-review)" ] } } diff --git a/android-app/app/src/main/res/layout/activity_main.xml b/android-app/app/src/main/res/layout/activity_main.xml index 552bf99..68abc60 100644 --- a/android-app/app/src/main/res/layout/activity_main.xml +++ b/android-app/app/src/main/res/layout/activity_main.xml @@ -65,7 +65,7 @@ android:contentDescription="Man Overboard" app:srcCompat="@android:drawable/ic_dialog_alert" app:backgroundTint="@color/mob_button_background" - app:layout_anchor="@id/bottom_navigation" + app:layout_anchor="@id/instrument_bottom_sheet" app:layout_anchorGravity="top|start" /> <!-- Record Track Button --> @@ -78,7 +78,7 @@ android:focusable="true" android:contentDescription="Record Track" app:srcCompat="@drawable/ic_track_record" - app:layout_anchor="@id/bottom_navigation" + app:layout_anchor="@id/instrument_bottom_sheet" app:layout_anchorGravity="top|end" /> </androidx.coordinatorlayout.widget.CoordinatorLayout> |