merge: reconcile master particle-wind work with origin/main redesign

Merged divergent branches (common ancestor a9d87b6). Took origin/main
as base (layer manager, recenter, quit button, GPX tracks, marine
conditions, dark theme, user position layer, active/past track layers)
and layered in particle wind simulation work:

- MapHandler: added setupWindLayer, updateWindLayer, updateWindGridLayer;
  kept their user-pos layer, follow/recenter state, active+past tracks
- WeatherRepository: kept their fetchCurrentConditions, added fetchWindGrid
- MainViewModel: kept their track/marine/summary changes, added windGrid
  StateFlow, loadWindGrid, buildGrid
- MainActivity: kept their full UI (layer picker, quit, recenter, fade
  animations), added particleWindView wiring, weatherLoaded guard,
  windArrow/windGrid observers
- activity_main.xml: took their LinearLayout redesign, added ParticleWindView
  overlay inside ConstraintLayout

https://claude.ai/code/session_01HXPjBsogsJVRwCiekDGkJX

1 files changed, 4 insertions, 1 deletions

diff --git a/.claude/settings.local.json b/.claude/settings.local.json
index 1e2b206..e581baf 100644
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -58,7 +58,10 @@
       "Bash(adb logcat:*)",
       "Bash(grep -v \"^--$\")",
       "Bash(./gradlew assembleDebug)",
-      "Skill(commit-commands:commit-push-pr)"
+      "Bash(gh:*)",
+      "Skill(commit-commands:commit-push-pr)",
+      "Skill(code-review:code-review)",
+      "Bash(python3 -m json.tool)"
     ]
   }
 }