From af0cd5864c5bf18d9bde40210344eda4013915ff Mon Sep 17 00:00:00 2001
From: tekstrand <tekstrand@users.noreply.github.com>
Date: Thu, 24 Sep 2026 17:50:29 -0500
Subject: [PATCH] Merged the Decodes tab into the Monitor tab.

The decode list now sits in the Monitor screen, embedded through a FragmentContainerView, so its reply, copy, clock sync and clear behave as they did on their own tab. The Decodes entry is gone from the bottom bar, the nav rail and the navigation graph, leaving Monitor, Messages, Transmit and Settings, and its label string and icon went with it.

In portrait the list goes under the waterfall and the status strip, with the waterfall taking 1.1 of the height to the list's 1. On a phone in landscape the screen is too short to stack all three, so the waterfall and the strip take the left half and the list runs the full height on the right. A tablet in landscape has the height, so it stays stacked with the list taking 1.3 to the waterfall's 1. The stacked split lives in float resources so portrait and tablet landscape share the numbers.

The list's own toolbar and floating clear button took about 110dp that a short screen cannot spare; stacked in phone landscape they left room for about one row. The list is now a card with a header strip in the same idiom as the Transmit tab's Queue card, and clear is an icon button in that strip. The card's spacing comes from its container, so in the side-by-side layout its top lines up with the waterfall's.

Verified on the phone emulator with decodes injected through a debug-only harness that is not part of this change: rows show, survive a round trip through the other tabs and a rotation, Reply opens Transmit with the callsign filled in, and clear empties the list. Portrait, phone landscape, and a 1280x800dp tablet-sized landscape all lay out as intended, and the side-by-side layout was checked on a Pixel 8a.
---
 .../com/js8call/example/ui/DecodeFragment.kt  |   9 +-
 .../app/src/main/res/drawable/ic_delete.xml   |  10 ++
 .../app/src/main/res/drawable/ic_notes.xml    |  13 --
 .../main/res/layout-land/fragment_monitor.xml |  40 ++++++
 .../layout-sw600dp-land/fragment_monitor.xml  |  31 +++++
 .../src/main/res/layout/fragment_decodes.xml  | 121 ++++++++++--------
 .../src/main/res/layout/fragment_monitor.xml  |  12 +-
 .../app/src/main/res/menu/bottom_nav_menu.xml |   5 -
 .../main/res/navigation/mobile_navigation.xml |   5 -
 .../main/res/values-sw600dp-land/dimens.xml   |   5 +
 android/app/src/main/res/values/dimens.xml    |   6 +
 android/app/src/main/res/values/strings.xml   |   1 -
 12 files changed, 173 insertions(+), 85 deletions(-)
 create mode 100644 android/app/src/main/res/drawable/ic_delete.xml
 delete mode 100644 android/app/src/main/res/drawable/ic_notes.xml
 create mode 100644 android/app/src/main/res/layout-land/fragment_monitor.xml
 create mode 100644 android/app/src/main/res/layout-sw600dp-land/fragment_monitor.xml
 create mode 100644 android/app/src/main/res/values-sw600dp-land/dimens.xml
 create mode 100644 android/app/src/main/res/values/dimens.xml

diff --git a/android/app/src/main/java/com/js8call/example/ui/DecodeFragment.kt b/android/app/src/main/java/com/js8call/example/ui/DecodeFragment.kt
index e46303707..ba96bc41f 100644
--- a/android/app/src/main/java/com/js8call/example/ui/DecodeFragment.kt
+++ b/android/app/src/main/java/com/js8call/example/ui/DecodeFragment.kt
@@ -13,7 +13,6 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.android.material.navigation.NavigationBarView
 import com.google.android.material.snackbar.Snackbar
 import com.js8call.example.R
@@ -29,7 +28,7 @@ class DecodeFragment : Fragment() {
 
     private lateinit var recyclerView: RecyclerView
     private lateinit var emptyText: TextView
-    private lateinit var clearFab: FloatingActionButton
+    private lateinit var clearButton: View
 
     private var myGroups: Set<String> = emptySet()
 
@@ -66,7 +65,7 @@ class DecodeFragment : Fragment() {
         // Find views
         recyclerView = view.findViewById(R.id.decodes_recycler_view)
         emptyText = view.findViewById(R.id.empty_text)
-        clearFab = view.findViewById(R.id.clear_fab)
+        clearButton = view.findViewById(R.id.clear_button)
 
         // Set up RecyclerView
         adapter = DecodeListAdapter().apply {
@@ -80,8 +79,8 @@ class DecodeFragment : Fragment() {
         }
         recyclerView.adapter = adapter
 
-        // Set up FAB
-        clearFab.setOnClickListener {
+        // Set up clear button
+        clearButton.setOnClickListener {
             confirmClearDecodes()
         }
 
diff --git a/android/app/src/main/res/drawable/ic_delete.xml b/android/app/src/main/res/drawable/ic_delete.xml
new file mode 100644
index 000000000..1a9f6dd18
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_delete.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z" />
+</vector>
diff --git a/android/app/src/main/res/drawable/ic_notes.xml b/android/app/src/main/res/drawable/ic_notes.xml
deleted file mode 100644
index eb0f830ce..000000000
--- a/android/app/src/main/res/drawable/ic_notes.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-    <group android:translateY="960">
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M160,-200v-80h400v80L160,-200ZM160,-440v-80h640v80L160,-440ZM160,-680v-80h640v80L160,-680Z" />
-    </group>
-</vector>
diff --git a/android/app/src/main/res/layout-land/fragment_monitor.xml b/android/app/src/main/res/layout-land/fragment_monitor.xml
new file mode 100644
index 000000000..bc35e0df7
--- /dev/null
+++ b/android/app/src/main/res/layout-land/fragment_monitor.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal">
+
+    <!-- Waterfall and status strip on the left -->
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <com.js8call.example.ui.WaterfallView
+            android:id="@+id/waterfall_view"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:background="@color/waterfall_background" />
+
+        <include
+            layout="@layout/monitor_status_card"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </LinearLayout>
+
+    <!-- Embedded decode list, full height on the right -->
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/decode_pane"
+        android:name="com.js8call.example.ui.DecodeFragment"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:clipToPadding="false"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
+        android:paddingBottom="8dp" />
+
+</LinearLayout>
diff --git a/android/app/src/main/res/layout-sw600dp-land/fragment_monitor.xml b/android/app/src/main/res/layout-sw600dp-land/fragment_monitor.xml
new file mode 100644
index 000000000..ebdfc41ec
--- /dev/null
+++ b/android/app/src/main/res/layout-sw600dp-land/fragment_monitor.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <!-- Waterfall View -->
+    <com.js8call.example.ui.WaterfallView
+        android:id="@+id/waterfall_view"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="@dimen/monitor_waterfall_weight"
+        android:background="@color/waterfall_background" />
+
+    <!-- Status strip -->
+    <include
+        layout="@layout/monitor_status_card"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <!-- Embedded decode list -->
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/decode_pane"
+        android:name="com.js8call.example.ui.DecodeFragment"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="@dimen/monitor_decodes_weight"
+        android:clipToPadding="false"
+        android:padding="8dp" />
+
+</LinearLayout>
diff --git a/android/app/src/main/res/layout/fragment_decodes.xml b/android/app/src/main/res/layout/fragment_decodes.xml
index f947eb3c7..dbac8c5d2 100644
--- a/android/app/src/main/res/layout/fragment_decodes.xml
+++ b/android/app/src/main/res/layout/fragment_decodes.xml
@@ -1,59 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <!-- Toolbar with actions -->
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/toolbar"
-        android:layout_width="0dp"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorSurface"
-        android:elevation="4dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:title="@string/decodes_title" />
-
-    <!-- RecyclerView for decodes -->
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/decodes_recycler_view"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:clipToPadding="false"
-        android:paddingVertical="4dp"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/toolbar"
-        tools:listitem="@layout/item_decode" />
-
-    <!-- Empty state -->
-    <TextView
-        android:id="@+id/empty_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/decodes_empty"
-        android:textAppearance="?attr/textAppearanceBodyLarge"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible" />
-
-    <!-- FAB for clear/actions -->
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/clear_fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="16dp"
-        android:contentDescription="@string/decodes_clear"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:srcCompat="@android:drawable/ic_menu_delete" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
+    android:layout_height="match_parent"
+    app:cardElevation="2dp">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <!-- Header strip, same idiom as the Transmit tab's Queue card -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/colorSurfaceVariant"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingStart="8dp"
+            android:paddingEnd="4dp">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:paddingVertical="8dp"
+                android:text="@string/decodes_title"
+                android:textAppearance="?attr/textAppearanceTitleMedium" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/clear_button"
+                style="@style/Widget.Material3.Button.IconButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="@string/decodes_clear"
+                app:icon="@drawable/ic_delete"
+                app:iconTint="?attr/colorOnSurfaceVariant" />
+        </LinearLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/decodes_recycler_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:clipToPadding="false"
+                android:paddingVertical="4dp"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                tools:listitem="@layout/item_decode" />
+
+            <TextView
+                android:id="@+id/empty_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="@string/decodes_empty"
+                android:textAppearance="?attr/textAppearanceBodyMedium"
+                android:textColor="?attr/colorOnSurfaceVariant"
+                android:visibility="gone"
+                tools:visibility="visible" />
+        </FrameLayout>
+
+    </LinearLayout>
+
+</com.google.android.material.card.MaterialCardView>
diff --git a/android/app/src/main/res/layout/fragment_monitor.xml b/android/app/src/main/res/layout/fragment_monitor.xml
index 8027683c2..ebdfc41ec 100644
--- a/android/app/src/main/res/layout/fragment_monitor.xml
+++ b/android/app/src/main/res/layout/fragment_monitor.xml
@@ -9,7 +9,7 @@
         android:id="@+id/waterfall_view"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1"
+        android:layout_weight="@dimen/monitor_waterfall_weight"
         android:background="@color/waterfall_background" />
 
     <!-- Status strip -->
@@ -18,4 +18,14 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
+    <!-- Embedded decode list -->
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/decode_pane"
+        android:name="com.js8call.example.ui.DecodeFragment"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="@dimen/monitor_decodes_weight"
+        android:clipToPadding="false"
+        android:padding="8dp" />
+
 </LinearLayout>
diff --git a/android/app/src/main/res/menu/bottom_nav_menu.xml b/android/app/src/main/res/menu/bottom_nav_menu.xml
index 7e839152c..426600c97 100644
--- a/android/app/src/main/res/menu/bottom_nav_menu.xml
+++ b/android/app/src/main/res/menu/bottom_nav_menu.xml
@@ -5,11 +5,6 @@
         android:icon="@drawable/ic_graphic_eq"
         android:title="@string/nav_monitor" />
 
-    <item
-        android:id="@+id/navigation_decodes"
-        android:icon="@drawable/ic_notes"
-        android:title="@string/nav_decodes" />
-
     <item
         android:id="@+id/navigation_messages"
         android:icon="@drawable/ic_chat_bubble"
diff --git a/android/app/src/main/res/navigation/mobile_navigation.xml b/android/app/src/main/res/navigation/mobile_navigation.xml
index 7d9feb2e8..689c41ec1 100644
--- a/android/app/src/main/res/navigation/mobile_navigation.xml
+++ b/android/app/src/main/res/navigation/mobile_navigation.xml
@@ -9,11 +9,6 @@
         android:name="com.js8call.example.ui.MonitorFragment"
         android:label="@string/nav_monitor" />
 
-    <fragment
-        android:id="@+id/navigation_decodes"
-        android:name="com.js8call.example.ui.DecodeFragment"
-        android:label="@string/nav_decodes" />
-
     <fragment
         android:id="@+id/navigation_messages"
         android:name="com.js8call.example.ui.MessagesFragment"
diff --git a/android/app/src/main/res/values-sw600dp-land/dimens.xml b/android/app/src/main/res/values-sw600dp-land/dimens.xml
new file mode 100644
index 000000000..d87910b7d
--- /dev/null
+++ b/android/app/src/main/res/values-sw600dp-land/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="monitor_waterfall_weight" format="float" type="dimen">1</item>
+    <item name="monitor_decodes_weight" format="float" type="dimen">1.3</item>
+</resources>
diff --git a/android/app/src/main/res/values/dimens.xml b/android/app/src/main/res/values/dimens.xml
new file mode 100644
index 000000000..1e5290024
--- /dev/null
+++ b/android/app/src/main/res/values/dimens.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Monitor split between the waterfall and the decode list -->
+    <item name="monitor_waterfall_weight" format="float" type="dimen">1.1</item>
+    <item name="monitor_decodes_weight" format="float" type="dimen">1</item>
+</resources>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 259044c55..c3f684f7b 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -4,7 +4,6 @@
 
     <!-- Bottom navigation -->
     <string name="nav_monitor">Monitor</string>
-    <string name="nav_decodes">Decodes</string>
     <string name="nav_messages">Messages</string>
     <string name="nav_transmit">Transmit</string>
     <string name="nav_settings">Settings</string>