From ccad2a1c97959f27e98f51df1aa3dccda84dd8c9 Mon Sep 17 00:00:00 2001 From: Phil Oliver <3497406+poliver@users.noreply.github.com> Date: Fri, 22 Aug 2025 17:23:10 -0400 Subject: [PATCH] Add share FAB button to conversations screen (#2818) --- .../java/com/geeksville/mesh/navigation/ContactsRoutes.kt | 1 + .../main/java/com/geeksville/mesh/ui/contact/Contacts.kt | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/app/src/main/java/com/geeksville/mesh/navigation/ContactsRoutes.kt b/app/src/main/java/com/geeksville/mesh/navigation/ContactsRoutes.kt index 0a5bac7cc..1e4d206ba 100644 --- a/app/src/main/java/com/geeksville/mesh/navigation/ContactsRoutes.kt +++ b/app/src/main/java/com/geeksville/mesh/navigation/ContactsRoutes.kt @@ -49,6 +49,7 @@ fun NavGraphBuilder.contactsGraph(navController: NavHostController, uiViewModel: uiViewModel, onNavigateToMessages = { navController.navigate(ContactsRoutes.Messages(it)) }, onNavigateToNodeDetails = { navController.navigate(NodesRoutes.NodeDetailGraph(it)) }, + onNavigateToShare = { navController.navigate(ChannelsRoutes.ChannelsGraph) }, ) } composable( diff --git a/app/src/main/java/com/geeksville/mesh/ui/contact/Contacts.kt b/app/src/main/java/com/geeksville/mesh/ui/contact/Contacts.kt index 9580b8157..6ac1143c5 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/contact/Contacts.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/contact/Contacts.kt @@ -32,9 +32,11 @@ import androidx.compose.material.icons.automirrored.twotone.VolumeUp import androidx.compose.material.icons.filled.Close import androidx.compose.material.icons.filled.Delete import androidx.compose.material.icons.filled.SelectAll +import androidx.compose.material.icons.rounded.QrCode2 import androidx.compose.material3.AlertDialog import androidx.compose.material3.Button import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.FloatingActionButton import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.RadioButton @@ -70,6 +72,7 @@ fun ContactsScreen( uiViewModel: UIViewModel = hiltViewModel(), onNavigateToMessages: (String) -> Unit = {}, onNavigateToNodeDetails: (Int) -> Unit = {}, + onNavigateToShare: () -> Unit, ) { var showMuteDialog by remember { mutableStateOf(false) } var showDeleteDialog by remember { mutableStateOf(false) } @@ -147,6 +150,9 @@ fun ContactsScreen( ) } }, + floatingActionButton = { + FloatingActionButton(onClick = onNavigateToShare) { Icon(Icons.Rounded.QrCode2, contentDescription = null) } + }, ) { paddingValues -> val channels by uiViewModel.channels.collectAsStateWithLifecycle() ContactListView(