From e4ae5ac3a83f1da940ab33c93da4ed3e03cd7f14 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Sat, 11 Apr 2026 09:53:34 +0000
Subject: Fix bottom sheet corners; add full light/dark mode palette
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Rounded corners:
- Replace androidx CardView with MaterialCardView + ShapeAppearance.Nav.BottomSheet
  so only the top-left and top-right corners are rounded (24dp); bottom corners
  are square flush with the screen edge

Light/dark mode:
- Introduce values-night/colors.xml with the existing dark M3 palette (moved from
  values/colors.xml); instrument values stay dark (#E6E1E5 text, #1C1B1F bg)
- values/colors.xml now carries the light M3 palette: surface #FFFBFE,
  onSurface #1C1B1F, surfaceVariant #E7E0EB etc.; instrument text flips to dark
  (#1C1B1F normal, #6F6878 secondary) for readability on light backgrounds
- Fix InstrumentUnit hardcoded #6B6070 → ?attr/colorOnSurfaceVariant so the
  unit labels adapt automatically in both modes
- Mark the forecast row (ocean navy #0D2137) and WaveView with
  android:forceDarkAllowed="false" so the system never inverts them — the
  ocean section is intentionally always dark regardless of system theme

https://claude.ai/code/session_01HXPjBsogsJVRwCiekDGkJX
---
 android-app/app/src/main/res/layout/activity_main.xml            | 6 +++---
 android-app/app/src/main/res/layout/layout_instruments_sheet.xml | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'android-app/app/src/main/res/layout')

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 1bb88b3..5f1c8c2 100644
--- a/android-app/app/src/main/res/layout/activity_main.xml
+++ b/android-app/app/src/main/res/layout/activity_main.xml
@@ -82,14 +82,14 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <!-- Collapsible Instrument Bottom Sheet -->
-        <androidx.cardview.widget.CardView
+        <com.google.android.material.card.MaterialCardView
             android:id="@+id/instrument_bottom_sheet"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:behavior_hideable="false"
             app:behavior_peekHeight="120dp"
             app:cardElevation="16dp"
-            app:cardCornerRadius="24dp"
+            app:shapeAppearance="@style/ShapeAppearance.Nav.BottomSheet"
             app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
             <include
@@ -97,7 +97,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
 
-        </androidx.cardview.widget.CardView>
+        </com.google.android.material.card.MaterialCardView>
 
         <!-- Record Track Button -->
         <com.google.android.material.floatingactionbutton.FloatingActionButton
diff --git a/android-app/app/src/main/res/layout/layout_instruments_sheet.xml b/android-app/app/src/main/res/layout/layout_instruments_sheet.xml
index edf0928..e14b468 100644
--- a/android-app/app/src/main/res/layout/layout_instruments_sheet.xml
+++ b/android-app/app/src/main/res/layout/layout_instruments_sheet.xml
@@ -159,9 +159,10 @@
 
     </LinearLayout>
 
-    <!-- Animated wave divider -->
+    <!-- Animated wave divider — always ocean-coloured, never inverted -->
     <org.terst.nav.ui.WaveView
         android:id="@+id/wave_divider"
+        android:forceDarkAllowed="false"
         android:layout_width="match_parent"
         android:layout_height="72dp"
         android:layout_marginStart="-16dp"
@@ -170,12 +171,13 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
-    <!-- Forecast section (ocean) -->
+    <!-- Forecast section (ocean — intentionally always dark, do not invert) -->
     <LinearLayout
         android:id="@+id/forecast_row"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
+        android:forceDarkAllowed="false"
         android:background="#0D2137"
         android:paddingTop="14dp"
         android:paddingBottom="20dp"
-- 
cgit v1.2.3