From ac861401338bcd71e9a31ba6fbfcbe0d85dcc4ea Mon Sep 17 00:00:00 2001
From: Jeffrey Starke <jeffrey@signal.org>
Date: Wed, 8 Oct 2025 14:53:02 -0400
Subject: [PATCH] Rename AppScaffold detailContent/listContent to
 primaryContent/secondaryContent.

---
 .../org/thoughtcrime/securesms/MainActivity.kt |  4 ++--
 .../conversation/NewConversationActivityV2.kt  | 10 +++++-----
 .../securesms/window/AppScaffold.kt            | 14 +++++++-------
 .../securesms/window/AppScaffoldWithTopBar.kt  | 18 +++++++++---------
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt
index 4a71958cab..9ee9ac1d8c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt
@@ -447,7 +447,7 @@ class MainActivity : PassphraseRequiredActivity(), VoiceNoteMediaControllerOwner
               )
             }
           },
-          listContent = {
+          secondaryContent = {
             val listContainerColor = if (windowSizeClass.isMedium()) {
               SignalTheme.colors.colorSurface1
             } else {
@@ -516,7 +516,7 @@ class MainActivity : PassphraseRequiredActivity(), VoiceNoteMediaControllerOwner
               }
             }
           },
-          detailContent = {
+          primaryContent = {
             when (mainNavigationState.currentListLocation) {
               MainNavigationListLocation.CHATS, MainNavigationListLocation.ARCHIVE -> {
                 DetailsScreenNavHost(
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/NewConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/NewConversationActivityV2.kt
index 2200949ca3..3060604688 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/NewConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/NewConversationActivityV2.kt
@@ -88,23 +88,23 @@ private fun NewConversationScreen(
         onNavigationClick = callbacks::onBackPressed
       )
     },
-    listContent = {
+    secondaryContent = {
       if (isSplitPane) {
         ScreenTitlePane(
           title = stringResource(R.string.NewConversationActivity__new_message),
           modifier = Modifier.fillMaxSize()
         )
       } else {
-        DetailPaneContent()
+        RecipientPicker()
       }
     },
 
-    detailContent = {
+    primaryContent = {
       Box(
         contentAlignment = Alignment.Center,
         modifier = Modifier.fillMaxSize()
       ) {
-        DetailPaneContent(
+        RecipientPicker(
           modifier = Modifier
             .widthIn(max = windowSizeClass.detailPaneMaxContentWidth)
         )
@@ -126,7 +126,7 @@ private interface Callbacks {
 }
 
 @Composable
-private fun DetailPaneContent(
+private fun RecipientPicker(
   modifier: Modifier = Modifier
 ) {
   RecipientPicker(
diff --git a/app/src/main/java/org/thoughtcrime/securesms/window/AppScaffold.kt b/app/src/main/java/org/thoughtcrime/securesms/window/AppScaffold.kt
index 66c03831a0..1902e1ac61 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/window/AppScaffold.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/window/AppScaffold.kt
@@ -211,20 +211,20 @@ enum class WindowSizeClass(
 @Composable
 fun AppScaffold(
   navigator: AppScaffoldNavigator<Any>,
-  detailContent: @Composable () -> Unit = {},
+  primaryContent: @Composable () -> Unit = {},
   navRailContent: @Composable () -> Unit = {},
   bottomNavContent: @Composable () -> Unit = {},
   paneExpansionState: PaneExpansionState = rememberPaneExpansionState(),
   paneExpansionDragHandle: (@Composable ThreePaneScaffoldScope.(PaneExpansionState) -> Unit)? = null,
   animatorFactory: AppScaffoldAnimationStateFactory = AppScaffoldAnimationStateFactory.Default,
-  listContent: @Composable () -> Unit
+  secondaryContent: @Composable () -> Unit
 ) {
   val isForcedCompact = WindowSizeClass.checkForcedCompact()
   val windowSizeClass = WindowSizeClass.rememberWindowSizeClass()
 
   if (isForcedCompact) {
     ListAndNavigation(
-      listContent = listContent,
+      listContent = secondaryContent,
       navRailContent = navRailContent,
       bottomNavContent = bottomNavContent,
       windowSizeClass = windowSizeClass
@@ -271,7 +271,7 @@ fun AppScaffold(
             }
         ) {
           ListAndNavigation(
-            listContent = listContent,
+            listContent = secondaryContent,
             navRailContent = navRailContent,
             bottomNavContent = bottomNavContent,
             windowSizeClass = windowSizeClass
@@ -312,7 +312,7 @@ fun AppScaffold(
               }
             }
         ) {
-          detailContent()
+          primaryContent()
         }
       }
     },
@@ -362,7 +362,7 @@ private fun AppScaffoldPreview() {
         defaultPanePreferredWidth = 416.dp,
         horizontalPartitionSpacerSize = 16.dp
       ),
-      listContent = {
+      secondaryContent = {
         Box(
           contentAlignment = Alignment.Center,
           modifier = Modifier
@@ -375,7 +375,7 @@ private fun AppScaffoldPreview() {
           )
         }
       },
-      detailContent = {
+      primaryContent = {
         Box(
           contentAlignment = Alignment.Center,
           modifier = Modifier
diff --git a/app/src/main/java/org/thoughtcrime/securesms/window/AppScaffoldWithTopBar.kt b/app/src/main/java/org/thoughtcrime/securesms/window/AppScaffoldWithTopBar.kt
index 32d8426c2f..f7a5031163 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/window/AppScaffoldWithTopBar.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/window/AppScaffoldWithTopBar.kt
@@ -41,13 +41,13 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore
 fun AppScaffoldWithTopBar(
   navigator: AppScaffoldNavigator<Any> = rememberAppScaffoldNavigator(),
   topBarContent: @Composable () -> Unit = {},
-  detailContent: @Composable () -> Unit = {},
+  primaryContent: @Composable () -> Unit = {},
   navRailContent: @Composable () -> Unit = {},
   bottomNavContent: @Composable () -> Unit = {},
   paneExpansionState: PaneExpansionState = rememberPaneExpansionState(),
   paneExpansionDragHandle: (@Composable ThreePaneScaffoldScope.(PaneExpansionState) -> Unit)? = null,
   animatorFactory: AppScaffoldAnimationStateFactory = AppScaffoldAnimationStateFactory.Default,
-  listContent: @Composable () -> Unit
+  secondaryContent: @Composable () -> Unit
 ) {
   val windowSizeClass = WindowSizeClass.rememberWindowSizeClass()
   val isSplitPane = windowSizeClass.isSplitPane(
@@ -60,28 +60,28 @@ fun AppScaffoldWithTopBar(
 
       AppScaffold(
         navigator = navigator,
-        detailContent = detailContent,
+        primaryContent = primaryContent,
         navRailContent = navRailContent,
         bottomNavContent = bottomNavContent,
         paneExpansionState = paneExpansionState,
         paneExpansionDragHandle = paneExpansionDragHandle,
         animatorFactory = animatorFactory,
-        listContent = listContent
+        secondaryContent = secondaryContent
       )
     }
   } else {
     AppScaffold(
       navigator = navigator,
-      detailContent = detailContent,
+      primaryContent = primaryContent,
       navRailContent = navRailContent,
       bottomNavContent = bottomNavContent,
       paneExpansionState = paneExpansionState,
       paneExpansionDragHandle = paneExpansionDragHandle,
       animatorFactory = animatorFactory,
-      listContent = {
+      secondaryContent = {
         Scaffold(topBar = topBarContent) { paddingValues ->
           Box(modifier = Modifier.padding(paddingValues)) {
-            listContent()
+            secondaryContent()
           }
         }
       }
@@ -110,7 +110,7 @@ private fun AppScaffoldWithTopBarPreview() {
         )
       },
 
-      listContent = {
+      secondaryContent = {
         Box(
           contentAlignment = Alignment.Center,
           modifier = Modifier
@@ -124,7 +124,7 @@ private fun AppScaffoldWithTopBarPreview() {
         }
       },
 
-      detailContent = {
+      primaryContent = {
         Box(
           contentAlignment = Alignment.Center,
           modifier = Modifier