From 5e156c8576341708625b5a293483c73924cce986 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Thu, 3 Apr 2025 10:48:45 -0300
Subject: [PATCH] Fix action mode rendering.

---
 .../securesms/main/MainActivityListHostFragment.kt          | 3 +--
 .../java/org/thoughtcrime/securesms/main/MainToolbar.kt     | 6 ++++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/main/MainActivityListHostFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/main/MainActivityListHostFragment.kt
index 04a2d2adc4..c51142969b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/main/MainActivityListHostFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/main/MainActivityListHostFragment.kt
@@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.main
 import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup
-import androidx.compose.runtime.getValue
 import androidx.core.view.ViewCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
@@ -162,7 +161,7 @@ class MainActivityListHostFragment : Fragment(R.layout.main_activity_list_host_f
   }
 
   private fun presentToolbarForMultiselect() {
-    toolbarViewModel.setToolbarMode(MainToolbarMode.NONE)
+    toolbarViewModel.setToolbarMode(MainToolbarMode.ACTION_MODE)
   }
 
   override fun onDestroyView() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/main/MainToolbar.kt b/app/src/main/java/org/thoughtcrime/securesms/main/MainToolbar.kt
index 95e78e2de9..29e36092a4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/main/MainToolbar.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/main/MainToolbar.kt
@@ -116,7 +116,7 @@ interface MainToolbarCallback {
 }
 
 enum class MainToolbarMode {
-  NONE,
+  ACTION_MODE,
   FULL,
   BASIC,
   SEARCH
@@ -146,12 +146,14 @@ data class MainToolbarState(
   }
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun MainToolbar(
   state: MainToolbarState,
   callback: MainToolbarCallback
 ) {
-  if (state.mode == MainToolbarMode.NONE) {
+  if (state.mode == MainToolbarMode.ACTION_MODE) {
+    TopAppBar(title = {})
     return
   }