From 80aa2531144563e8a117ffd81f6dd6d9af8bd574 Mon Sep 17 00:00:00 2001
From: Peter Stone <thepeterstone@gmail.com>
Date: Thu, 2 Jul 2026 02:56:25 +0000
Subject: fix+feat: layer cards, ocean floor, notifications, units, log, photos
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Layer picker:
- Fix blank cards: app:layout_columnWeight → android:layout_columnWeight
  (GridLayout children require android: namespace for weight attributes)
- Add Distance unit chips (nm/km/mi) to UNITS section

Map layers:
- Fix ocean floor: use addLayerAbove(lastFillLayer) instead of addLayerAt(0)
  so base rasters appear above OFM water/land fills but below roads+labels
- CardView elevation 16dp→4dp to eliminate visible shadow border

Notifications:
- Add POST_NOTIFICATIONS to manifest
- Request it alongside location permissions on Android 13+ (TIRAMISU+)

Conditions sheet:
- showOverlay() now always hides bottom sheet (STATE_HIDDEN) so it can't
  leak onto non-map pages; bottom padding (80dp) added to Safety+Log panes

Log entries:
- Log entry form visible always (was only shown while recording)
- Photo-only events filtered from track timeline; photos appear only when
  paired with real text in a log entry

Anchor watch:
- Inputs and output radius now use configured depth unit (ft/m)
  with label updates and ft→m conversion before calculation

Photos:
- Tap thumbnail in track event log → fullscreen dialog viewer

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../app/src/main/res/layout/activity_main.xml      |  2 +-
 .../app/src/main/res/layout/fragment_safety.xml    |  6 +-
 .../app/src/main/res/layout/fragment_voice_log.xml |  9 +--
 .../main/res/layout/layout_layer_picker_sheet.xml  | 69 +++++++++++++++++-----
 4 files changed, 66 insertions(+), 20 deletions(-)

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

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 ed1b7ce..99aa192 100644
--- a/android-app/app/src/main/res/layout/activity_main.xml
+++ b/android-app/app/src/main/res/layout/activity_main.xml
@@ -126,7 +126,7 @@
             android:layout_height="wrap_content"
             app:behavior_hideable="false"
             app:behavior_peekHeight="120dp"
-            app:cardElevation="16dp"
+            app:cardElevation="4dp"
             app:strokeWidth="0dp"
             app:shapeAppearance="@style/ShapeAppearance.Nav.BottomSheet"
             app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
diff --git a/android-app/app/src/main/res/layout/fragment_safety.xml b/android-app/app/src/main/res/layout/fragment_safety.xml
index 78f8754..4a8efa9 100644
--- a/android-app/app/src/main/res/layout/fragment_safety.xml
+++ b/android-app/app/src/main/res/layout/fragment_safety.xml
@@ -4,7 +4,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface">
+    android:background="?attr/colorSurface"
+    android:clipToPadding="false"
+    android:paddingBottom="80dp">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -179,6 +181,7 @@
                             android:layout_marginEnd="8dp">
 
                             <TextView
+                                android:id="@+id/tv_anchor_depth_label"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="@string/anchor_depth_label"
@@ -203,6 +206,7 @@
                             android:layout_marginStart="8dp">
 
                             <TextView
+                                android:id="@+id/tv_anchor_rode_label"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="@string/anchor_rode_label"
diff --git a/android-app/app/src/main/res/layout/fragment_voice_log.xml b/android-app/app/src/main/res/layout/fragment_voice_log.xml
index b1c440c..cacc6d6 100644
--- a/android-app/app/src/main/res/layout/fragment_voice_log.xml
+++ b/android-app/app/src/main/res/layout/fragment_voice_log.xml
@@ -3,7 +3,9 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:clipToPadding="false"
+    android:paddingBottom="80dp">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -11,13 +13,12 @@
         android:orientation="vertical"
         android:padding="20dp">
 
-        <!-- ── Log entry section — visible only while recording ── -->
+        <!-- ── Log entry section ── -->
         <LinearLayout
             android:id="@+id/layout_log_entry"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:visibility="gone">
+            android:orientation="vertical">
 
             <TextView
                 android:layout_width="wrap_content"
diff --git a/android-app/app/src/main/res/layout/layout_layer_picker_sheet.xml b/android-app/app/src/main/res/layout/layout_layer_picker_sheet.xml
index ce52108..b7cf00e 100644
--- a/android-app/app/src/main/res/layout/layout_layer_picker_sheet.xml
+++ b/android-app/app/src/main/res/layout/layout_layer_picker_sheet.xml
@@ -51,7 +51,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_margin="4dp"
-                app:layout_columnWeight="1"
+                android:layout_columnWeight="1"
                 app:cardCornerRadius="12dp"
                 app:strokeWidth="0dp">
                 <LinearLayout
@@ -81,7 +81,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_margin="4dp"
-                app:layout_columnWeight="1"
+                android:layout_columnWeight="1"
                 app:cardCornerRadius="12dp"
                 app:strokeWidth="0dp">
                 <LinearLayout
@@ -111,7 +111,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_margin="4dp"
-                app:layout_columnWeight="1"
+                android:layout_columnWeight="1"
                 app:cardCornerRadius="12dp"
                 app:strokeWidth="0dp">
                 <LinearLayout
@@ -141,7 +141,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_margin="4dp"
-                app:layout_columnWeight="1"
+                android:layout_columnWeight="1"
                 app:cardCornerRadius="12dp"
                 app:strokeWidth="0dp">
                 <LinearLayout
@@ -196,7 +196,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_margin="4dp"
-                app:layout_columnWeight="1"
+                android:layout_columnWeight="1"
                 app:cardCornerRadius="12dp"
                 app:strokeWidth="0dp">
                 <LinearLayout
@@ -225,7 +225,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_margin="4dp"
-                app:layout_columnWeight="1"
+                android:layout_columnWeight="1"
                 app:cardCornerRadius="12dp"
                 app:strokeWidth="0dp">
                 <LinearLayout
@@ -254,7 +254,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_margin="4dp"
-                app:layout_columnWeight="1"
+                android:layout_columnWeight="1"
                 app:cardCornerRadius="12dp"
                 app:strokeWidth="0dp">
                 <LinearLayout
@@ -308,7 +308,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_margin="4dp"
-                app:layout_columnWeight="1"
+                android:layout_columnWeight="1"
                 app:cardCornerRadius="12dp"
                 app:strokeWidth="0dp">
                 <LinearLayout
@@ -337,7 +337,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_margin="4dp"
-                app:layout_columnWeight="1"
+                android:layout_columnWeight="1"
                 app:cardCornerRadius="12dp"
                 app:strokeWidth="0dp">
                 <LinearLayout
@@ -366,7 +366,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_margin="4dp"
-                app:layout_columnWeight="1"
+                android:layout_columnWeight="1"
                 app:cardCornerRadius="12dp"
                 app:strokeWidth="0dp">
                 <LinearLayout
@@ -420,7 +420,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_margin="4dp"
-                app:layout_columnWeight="1"
+                android:layout_columnWeight="1"
                 app:cardCornerRadius="12dp"
                 app:strokeWidth="0dp">
                 <LinearLayout
@@ -449,7 +449,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_margin="4dp"
-                app:layout_columnWeight="1"
+                android:layout_columnWeight="1"
                 app:cardCornerRadius="12dp"
                 app:strokeWidth="0dp">
                 <LinearLayout
@@ -503,7 +503,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_margin="4dp"
-                app:layout_columnWeight="1"
+                android:layout_columnWeight="1"
                 app:cardCornerRadius="12dp"
                 app:strokeWidth="0dp">
                 <LinearLayout
@@ -658,7 +658,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:gravity="center_vertical">
+            android:gravity="center_vertical"
+            android:layout_marginBottom="10dp">
             <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -693,5 +694,45 @@
             </com.google.android.material.chip.ChipGroup>
         </LinearLayout>
 
+        <!-- Distance -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="center_vertical">
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="Distance"
+                android:textSize="14sp"
+                android:textColor="@color/instrument_text_normal" />
+            <com.google.android.material.chip.ChipGroup
+                android:id="@+id/chip_group_distance"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:singleSelection="true"
+                app:selectionRequired="true">
+                <com.google.android.material.chip.Chip
+                    android:id="@+id/chip_nm"
+                    style="@style/Widget.Material3.Chip.Filter"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="nm" />
+                <com.google.android.material.chip.Chip
+                    android:id="@+id/chip_km"
+                    style="@style/Widget.Material3.Chip.Filter"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="km" />
+                <com.google.android.material.chip.Chip
+                    android:id="@+id/chip_mi"
+                    style="@style/Widget.Material3.Chip.Filter"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="mi" />
+            </com.google.android.material.chip.ChipGroup>
+        </LinearLayout>
+
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
-- 
cgit v1.2.3