Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-20 11:08:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename AppScaffold detailContent/listContent to primaryContent/secondaryContent.

Browse Source
This commit is contained in:
Jeffrey Starke
2025-10-08 14:53:02 -04:00
committed by Alex Hart
parent 534756c833
commit ac86140133
4 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt
View File

@@ -447,7 +447,7 @@ class MainActivity : PassphraseRequiredActivity(), VoiceNoteMediaControllerOwner
) )
} }
}, },
listContent = { secondaryContent = {
val listContainerColor = if (windowSizeClass.isMedium()) { val listContainerColor = if (windowSizeClass.isMedium()) {
SignalTheme.colors.colorSurface1 SignalTheme.colors.colorSurface1
} else { } else {
@@ -516,7 +516,7 @@ class MainActivity : PassphraseRequiredActivity(), VoiceNoteMediaControllerOwner
} }
} }
}, },
detailContent = { primaryContent = {
when (mainNavigationState.currentListLocation) { when (mainNavigationState.currentListLocation) {
MainNavigationListLocation.CHATS, MainNavigationListLocation.ARCHIVE -> { MainNavigationListLocation.CHATS, MainNavigationListLocation.ARCHIVE -> {
DetailsScreenNavHost( DetailsScreenNavHost(

10
app/src/main/java/org/thoughtcrime/securesms/conversation/NewConversationActivityV2.kt
View File

@@ -88,23 +88,23 @@ private fun NewConversationScreen(
onNavigationClick = callbacks::onBackPressed onNavigationClick = callbacks::onBackPressed
) )
}, },
listContent = { secondaryContent = {
if (isSplitPane) { if (isSplitPane) {
ScreenTitlePane( ScreenTitlePane(
title = stringResource(R.string.NewConversationActivity__new_message), title = stringResource(R.string.NewConversationActivity__new_message),
modifier = Modifier.fillMaxSize() modifier = Modifier.fillMaxSize()
) )
} else { } else {
DetailPaneContent() RecipientPicker()
} }
}, },
detailContent = { primaryContent = {
Box( Box(
contentAlignment = Alignment.Center, contentAlignment = Alignment.Center,
modifier = Modifier.fillMaxSize() modifier = Modifier.fillMaxSize()
) { ) {
DetailPaneContent( RecipientPicker(
modifier = Modifier modifier = Modifier
.widthIn(max = windowSizeClass.detailPaneMaxContentWidth) .widthIn(max = windowSizeClass.detailPaneMaxContentWidth)
) )
@@ -126,7 +126,7 @@ private interface Callbacks {
} }
@Composable @Composable
private fun DetailPaneContent( private fun RecipientPicker(
modifier: Modifier = Modifier modifier: Modifier = Modifier
) { ) {
RecipientPicker( RecipientPicker(

14
app/src/main/java/org/thoughtcrime/securesms/window/AppScaffold.kt
View File

@@ -211,20 +211,20 @@ enum class WindowSizeClass(
@Composable @Composable
fun AppScaffold( fun AppScaffold(
navigator: AppScaffoldNavigator<Any>, navigator: AppScaffoldNavigator<Any>,
detailContent: @Composable () -> Unit = {}, primaryContent: @Composable () -> Unit = {},
navRailContent: @Composable () -> Unit = {}, navRailContent: @Composable () -> Unit = {},
bottomNavContent: @Composable () -> Unit = {}, bottomNavContent: @Composable () -> Unit = {},
paneExpansionState: PaneExpansionState = rememberPaneExpansionState(), paneExpansionState: PaneExpansionState = rememberPaneExpansionState(),
paneExpansionDragHandle: (@Composable ThreePaneScaffoldScope.(PaneExpansionState) -> Unit)? = null, paneExpansionDragHandle: (@Composable ThreePaneScaffoldScope.(PaneExpansionState) -> Unit)? = null,
animatorFactory: AppScaffoldAnimationStateFactory = AppScaffoldAnimationStateFactory.Default, animatorFactory: AppScaffoldAnimationStateFactory = AppScaffoldAnimationStateFactory.Default,
listContent: @Composable () -> Unit secondaryContent: @Composable () -> Unit
) { ) {
val isForcedCompact = WindowSizeClass.checkForcedCompact() val isForcedCompact = WindowSizeClass.checkForcedCompact()
val windowSizeClass = WindowSizeClass.rememberWindowSizeClass() val windowSizeClass = WindowSizeClass.rememberWindowSizeClass()
if (isForcedCompact) { if (isForcedCompact) {
ListAndNavigation( ListAndNavigation(
listContent = listContent, listContent = secondaryContent,
navRailContent = navRailContent, navRailContent = navRailContent,
bottomNavContent = bottomNavContent, bottomNavContent = bottomNavContent,
windowSizeClass = windowSizeClass windowSizeClass = windowSizeClass
@@ -271,7 +271,7 @@ fun AppScaffold(
} }
) { ) {
ListAndNavigation( ListAndNavigation(
listContent = listContent, listContent = secondaryContent,
navRailContent = navRailContent, navRailContent = navRailContent,
bottomNavContent = bottomNavContent, bottomNavContent = bottomNavContent,
windowSizeClass = windowSizeClass windowSizeClass = windowSizeClass
@@ -312,7 +312,7 @@ fun AppScaffold(
} }
} }
) { ) {
detailContent() primaryContent()
} }
} }
}, },
@@ -362,7 +362,7 @@ private fun AppScaffoldPreview() {
defaultPanePreferredWidth = 416.dp, defaultPanePreferredWidth = 416.dp,
horizontalPartitionSpacerSize = 16.dp horizontalPartitionSpacerSize = 16.dp
), ),
listContent = { secondaryContent = {
Box( Box(
contentAlignment = Alignment.Center, contentAlignment = Alignment.Center,
modifier = Modifier modifier = Modifier
@@ -375,7 +375,7 @@ private fun AppScaffoldPreview() {
) )
} }
}, },
detailContent = { primaryContent = {
Box( Box(
contentAlignment = Alignment.Center, contentAlignment = Alignment.Center,
modifier = Modifier modifier = Modifier

18
app/src/main/java/org/thoughtcrime/securesms/window/AppScaffoldWithTopBar.kt
View File

@@ -41,13 +41,13 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore
fun AppScaffoldWithTopBar( fun AppScaffoldWithTopBar(
navigator: AppScaffoldNavigator<Any> = rememberAppScaffoldNavigator(), navigator: AppScaffoldNavigator<Any> = rememberAppScaffoldNavigator(),
topBarContent: @Composable () -> Unit = {}, topBarContent: @Composable () -> Unit = {},
detailContent: @Composable () -> Unit = {}, primaryContent: @Composable () -> Unit = {},
navRailContent: @Composable () -> Unit = {}, navRailContent: @Composable () -> Unit = {},
bottomNavContent: @Composable () -> Unit = {}, bottomNavContent: @Composable () -> Unit = {},
paneExpansionState: PaneExpansionState = rememberPaneExpansionState(), paneExpansionState: PaneExpansionState = rememberPaneExpansionState(),
paneExpansionDragHandle: (@Composable ThreePaneScaffoldScope.(PaneExpansionState) -> Unit)? = null, paneExpansionDragHandle: (@Composable ThreePaneScaffoldScope.(PaneExpansionState) -> Unit)? = null,
animatorFactory: AppScaffoldAnimationStateFactory = AppScaffoldAnimationStateFactory.Default, animatorFactory: AppScaffoldAnimationStateFactory = AppScaffoldAnimationStateFactory.Default,
listContent: @Composable () -> Unit secondaryContent: @Composable () -> Unit
) { ) {
val windowSizeClass = WindowSizeClass.rememberWindowSizeClass() val windowSizeClass = WindowSizeClass.rememberWindowSizeClass()
val isSplitPane = windowSizeClass.isSplitPane( val isSplitPane = windowSizeClass.isSplitPane(
@@ -60,28 +60,28 @@ fun AppScaffoldWithTopBar(
AppScaffold( AppScaffold(
navigator = navigator, navigator = navigator,
detailContent = detailContent, primaryContent = primaryContent,
navRailContent = navRailContent, navRailContent = navRailContent,
bottomNavContent = bottomNavContent, bottomNavContent = bottomNavContent,
paneExpansionState = paneExpansionState, paneExpansionState = paneExpansionState,
paneExpansionDragHandle = paneExpansionDragHandle, paneExpansionDragHandle = paneExpansionDragHandle,
animatorFactory = animatorFactory, animatorFactory = animatorFactory,
listContent = listContent secondaryContent = secondaryContent
) )
} }
} else { } else {
AppScaffold( AppScaffold(
navigator = navigator, navigator = navigator,
detailContent = detailContent, primaryContent = primaryContent,
navRailContent = navRailContent, navRailContent = navRailContent,
bottomNavContent = bottomNavContent, bottomNavContent = bottomNavContent,
paneExpansionState = paneExpansionState, paneExpansionState = paneExpansionState,
paneExpansionDragHandle = paneExpansionDragHandle, paneExpansionDragHandle = paneExpansionDragHandle,
animatorFactory = animatorFactory, animatorFactory = animatorFactory,
listContent = { secondaryContent = {
Scaffold(topBar = topBarContent) { paddingValues -> Scaffold(topBar = topBarContent) { paddingValues ->
Box(modifier = Modifier.padding(paddingValues)) { Box(modifier = Modifier.padding(paddingValues)) {
listContent() secondaryContent()
} }
} }
} }
@@ -110,7 +110,7 @@ private fun AppScaffoldWithTopBarPreview() {
) )
}, },
listContent = { secondaryContent = {
Box( Box(
contentAlignment = Alignment.Center, contentAlignment = Alignment.Center,
modifier = Modifier modifier = Modifier
@@ -124,7 +124,7 @@ private fun AppScaffoldWithTopBarPreview() {
} }
}, },
detailContent = { primaryContent = {
Box( Box(
contentAlignment = Alignment.Center, contentAlignment = Alignment.Center,
modifier = Modifier modifier = Modifier