From cc76e4f3cc4e4d958f398ed2899a8d653815985b Mon Sep 17 00:00:00 2001 From: Peter Stone Date: Sun, 15 Mar 2026 06:52:23 +0000 Subject: fix: move weather feature to org/terst/nav package directories Package declarations were already org.terst.nav.* but files lived under com/example/androidapp/. Kotlin 2.0 (K2) compiler on CI fails when package declarations don't match directory structure during kapt stub generation. Moved all 20 files to their correct locations and renamed MainActivity (weather) -> WeatherActivity to avoid confusion with the nav app's MainActivity. Co-Authored-By: Claude Sonnet 4.6 --- .../merged.dir/values/values.xml | 818 +++++++++++++-------- 1 file changed, 508 insertions(+), 310 deletions(-) (limited to 'android-app/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir') diff --git a/android-app/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/android-app/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml index ec72700..73a1a77 100644 --- a/android-app/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml +++ b/android-app/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml @@ -630,6 +630,7 @@ #7fa87f @android:color/black @android:color/black + #FF6D00 @color/material_deep_teal_200 @color/material_deep_teal_500 #3F51B5 @@ -710,6 +711,7 @@ #E61E1E1E #FFFF0000 #FFFFFFFF + #B3FFFFFF #FFFFFF00 #ff000000 #ff000000 @@ -963,6 +965,9 @@ #FF110000 #ffffffff #ff9e9e9e + #FFFFFF + #0D47A1 + #002171 @android:color/black @color/material_grey_600 @color/material_grey_900 @@ -980,6 +985,7 @@ #8a000000 #36ffffff #24000000 + #FFFFFF #ff616161 #ffbdbdbd #ffbdbdbd @@ -989,6 +995,10 @@ #e6616161 #e6FFFFFF #FFFFFFFF + #FFFFFFFF + #FF9800 + #4CAF50 + #F44336 16dp 72dp 56dp @@ -1855,6 +1865,7 @@ + @@ -1875,6 +1886,7 @@ + @@ -2027,7 +2039,7 @@ Anchor Watch Anchor Watch Inactive androidx.startup - AndroidApp + nav com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior com.google.android.material.bottomsheet.BottomSheetBehavior Collapse the bottom sheet @@ -2070,6 +2082,8 @@ Error: invalid Error + Could not get location. Showing default position. + Failed to load weather data. Show dropdown menu Toggle Anchor Watch Configuration Activate Man Overboard (MOB) alarm @@ -2083,6 +2097,7 @@ com.google.android.material.behavior.HideBottomViewOnScrollBehavior Dialog Icon AWS + BAROMETER BOAT SPEED BSP COG @@ -2091,10 +2106,12 @@ HDG POLAR % SOG + TREND TWS VMG WIND Tab + Fetching weather… %1$s%2$s sans-serif-medium sans-serif @@ -2211,12 +2228,16 @@ M0,16 A16,16 0 0,1 16,0 H36 A16,16 0 0,1 36,32 H16 A16,16 0 0,1 0,16 Cancel OK + Forecast + Map Show password M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z M2,4.27 L19.73,22 L22.27,19.46 L4.54,1.73 L4.54,1 L23,1 L23,23 L1,23 L1,4.27 Z M2,4.27 L2,4.27 L4.54,1.73 L4.54,1.73 L4.54,1 L23,1 L23,23 L1,23 L1,4.27 Z M3.27,4.27 L19.74,20.74 + Location is needed to show weather for your current position. --.- + ----.- --.- --- --.- @@ -2225,6 +2246,7 @@ --.- --.- --.- + %d%% nav-test-c2872 Search @@ -2235,6 +2257,8 @@ Side Sheet com.google.android.material.sidesheet.SideSheetBehavior 999+ + %.0f °C + %.0f kt - - + + +