Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hide app bar on iOS #1055

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app-ios/Modules/Sources/Contributor/ContributorView.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Component
import Model
import KMPContainer
import Model
import shared
import SwiftUI

Expand All @@ -20,6 +20,7 @@ public struct ContributorView: View {
NSLog("contributorUrl:"+contributorUrl)
}
)
.navigationTitle("Contributor")
}
}

Expand All @@ -41,6 +42,7 @@ struct ContributorComposeView: UIViewControllerRepresentable {
func makeUIViewController(context: Context) -> UIViewController {
let vc = DarwinContributorsKt.contributorViewController(
contributorsRepository: contributorsRepository,
isTopAppBarHidden: true,
onNavigationIconClick: onNavigationIconClick,
onContributorItemClick: onContributorItemClick
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ data class ContributorsUiState(val contributors: PersistentList<Contributor>)
@Composable
fun ContributorsScreen(
viewModel: ContributorsViewModel,
isTopAppBarHidden: Boolean = false,
onNavigationIconClick: () -> Unit,
onContributorItemClick: (url: String) -> Unit,
contentPadding: PaddingValues = PaddingValues(),
Expand All @@ -52,6 +53,7 @@ fun ContributorsScreen(
)
ContributorsScreen(
uiState = uiState,
isTopAppBarHidden = isTopAppBarHidden,
snackbarHostState = snackbarHostState,
onBackClick = onNavigationIconClick,
onContributorItemClick = onContributorItemClick,
Expand All @@ -67,31 +69,39 @@ private fun ContributorsScreen(
onBackClick: () -> Unit,
onContributorItemClick: (url: String) -> Unit,
contentPadding: PaddingValues,
isTopAppBarHidden: Boolean,
) {
val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior()
val scrollBehavior =
if (!isTopAppBarHidden) {
TopAppBarDefaults.exitUntilCollapsedScrollBehavior()
} else {
null
}
val localLayoutDirection = LocalLayoutDirection.current
Scaffold(
modifier = Modifier.testTag(ContributorsScreenTestTag),
snackbarHost = { SnackbarHost(hostState = snackbarHostState) },
topBar = {
LargeTopAppBar(
title = {
Text(text = "Contributor")
},
navigationIcon = {
IconButton(
modifier = Modifier.alpha(1f - scrollBehavior.state.collapsedFraction),
onClick = onBackClick,
enabled = scrollBehavior.state.collapsedFraction < 1f,
) {
Icon(
imageVector = Icons.Default.ArrowBack,
contentDescription = "Back",
)
}
},
scrollBehavior = scrollBehavior
)
if (scrollBehavior != null) {
LargeTopAppBar(
title = {
Text(text = "Contributor")
},
navigationIcon = {
IconButton(
modifier = Modifier.alpha(1f - scrollBehavior.state.collapsedFraction),
onClick = onBackClick,
enabled = scrollBehavior.state.collapsedFraction < 1f,
) {
Icon(
imageVector = Icons.Default.ArrowBack,
contentDescription = "Back",
)
}
},
scrollBehavior = scrollBehavior
)
}
},
contentWindowInsets = WindowInsets(
left = contentPadding.calculateLeftPadding(localLayoutDirection),
Expand All @@ -105,7 +115,13 @@ private fun ContributorsScreen(
onContributorItemClick = onContributorItemClick,
modifier = Modifier
.fillMaxSize()
.nestedScroll(scrollBehavior.nestedScrollConnection),
.let {
if (scrollBehavior != null) {
it.nestedScroll(scrollBehavior.nestedScrollConnection)
} else {
it
}
},
contentPadding = innerContentPadding,
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import platform.UIKit.UIViewController
@Suppress("UNUSED")
fun contributorViewController(
contributorsRepository: ContributorsRepository,
isTopAppBarHidden: Boolean,
onNavigationIconClick: () -> Unit,
onContributorItemClick: (url: String) -> Unit,
): UIViewController = ComposeUIViewController {
Expand All @@ -28,6 +29,7 @@ fun contributorViewController(

ContributorsScreen(
viewModel = viewModel,
isTopAppBarHidden = isTopAppBarHidden,
onNavigationIconClick = onNavigationIconClick,
onContributorItemClick = onContributorItemClick,
)
Expand Down
Loading