summaryrefslogtreecommitdiff
path: root/android-app/gradle/wrapper
diff options
context:
space:
mode:
authorClaude <noreply@anthropic.com>2026-04-09 09:39:20 +0000
committerClaude <noreply@anthropic.com>2026-04-09 09:39:20 +0000
commite109271f563327e461191c7c2988243c75cd58ab (patch)
treee8401f41bb7f96421175d242bee77245eb68c738 /android-app/gradle/wrapper
parent3cddcd3b0a8719da5e828734a1d3054cef803235 (diff)
parent5ee2dd8925afa858f466ae63db3f7df5c7516953 (diff)
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
Diffstat (limited to 'android-app/gradle/wrapper')
0 files changed, 0 insertions, 0 deletions