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.

Sign up for GitHub

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

Fix top app bar #67

Merged
merged 3 commits into from
Sep 20, 2024
Merged

Fix top app bar #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
605f734
Fix top app bar font style
LunarX Sep 19, 2024
d99c018
Fix disappearing back arrow in phone mode
LunarX Sep 19, 2024
45f7381
Correctly name option scaffold top app bar navigation menu
LunarX Sep 20, 2024
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
2 changes: 1 addition & 1 deletion app/src/main/java/com/infomaniak/swisstransfer/ui/components/SwissTransferTobAppBar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ fun SwissTransferTobAppBar(
actionIconContentColor = SwissTransferTheme.colors.toolbarIconColor,
navigationIconContentColor = SwissTransferTheme.colors.toolbarIconColor,
),
title = { Text(stringResource(id = titleRes)) },
title = { Text(stringResource(id = titleRes), style = SwissTransferTheme.typography.h2) },
navigationIcon = { navigationMenu?.let { MenuButton(navigationMenu) } },
actions = { actionMenus.forEach { actionMenu -> MenuButton(actionMenu) } },
)
Expand Down
10 changes: 8 additions & 2 deletions ...in/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/OptionScaffold.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.Scaffold
import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteType
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableIntStateOf
Expand All @@ -31,6 +32,7 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import com.infomaniak.swisstransfer.ui.components.SwissTransferTobAppBar
import com.infomaniak.swisstransfer.ui.components.TopAppBarButton
import com.infomaniak.swisstransfer.ui.screen.main.LocalNavType

@Composable
fun OptionScaffold(
Expand All @@ -42,8 +44,12 @@ fun OptionScaffold(
navigateBack: (() -> Unit)? = null,
) {
Scaffold(topBar = {
val canDisplayBackButton = navigateBack?.let { TopAppBarButton.backButton(navigateBack) }
SwissTransferTobAppBar(topAppBarTitleRes, navigationMenu = canDisplayBackButton)
val backNavigationMenu = if (LocalNavType.current == NavigationSuiteType.NavigationBar) {
TopAppBarButton.backButton(navigateBack ?: {})
} else {
null
}
SwissTransferTobAppBar(topAppBarTitleRes, navigationMenu = backNavigationMenu)
}) { paddingsValue ->
Column(
modifier = Modifier
Expand Down
Loading