wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Set proper toolbar title when saving server settings

Browse source
This commit is contained in:
cketti 2024-02-01 17:52:25 +01:00
parent b7dcbce90d
commit bd323131e6
4 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
feature/account/edit/src/main/kotlin/app/k9mail/feature/account/edit/ui/server/settings/EditIncomingServerSettingsNavHost.kt
View file

@ -61,6 +61,7 @@ fun EditIncomingServerSettingsNavHost(
}
composable(route = NESTED_NAVIGATION_ROUTE_SAVE) {
SaveServerSettingsScreen(
title = stringResource(id = R.string.account_server_settings_incoming_top_bar_title),
onNext = onFinish,
onBack = { navController.popBackStack(route = NESTED_NAVIGATION_ROUTE_MODIFY, inclusive = false) },
viewModel = koinViewModel<SaveIncomingServerSettingsViewModel> {

1
feature/account/edit/src/main/kotlin/app/k9mail/feature/account/edit/ui/server/settings/EditOutgoingServerSettingsNavHost.kt
View file

@ -61,6 +61,7 @@ fun EditOutgoingServerSettingsNavHost(
}
composable(route = NESTED_NAVIGATION_ROUTE_SAVE) {
SaveServerSettingsScreen(
title = stringResource(id = R.string.account_server_settings_outgoing_top_bar_title),
onNext = onFinish,
onBack = { navController.popBackStack(route = NESTED_NAVIGATION_ROUTE_MODIFY, inclusive = false) },
viewModel = koinViewModel<SaveOutgoingServerSettingsViewModel> {

5
feature/account/edit/src/main/kotlin/app/k9mail/feature/account/edit/ui/server/settings/save/SaveServerSettingsScreen.kt
View file

@ -19,6 +19,7 @@ import app.k9mail.feature.account.edit.ui.server.settings.save.fake.FakeSaveServ
@Composable
fun SaveServerSettingsScreen(
title: String,
onNext: () -> Unit,
onBack: () -> Unit,
viewModel: ViewModel,
@ -42,7 +43,7 @@ fun SaveServerSettingsScreen(
Scaffold(
topBar = {
AccountTopAppBarWithBackButton(
title = "Edit Server Settings",
title = title,
onBackClicked = {
dispatch(Event.OnBackClicked)
},
@ -76,6 +77,7 @@ fun SaveServerSettingsScreen(
internal fun SaveServerSettingsScreenK9Preview() {
K9Theme {
SaveServerSettingsScreen(
title = "Incoming server settings",
onNext = {},
onBack = {},
viewModel = FakeSaveServerSettingsViewModel(
@ -90,6 +92,7 @@ internal fun SaveServerSettingsScreenK9Preview() {
internal fun SaveServerSettingsScreenThunderbirdPreview() {
ThunderbirdTheme {
SaveServerSettingsScreen(
title = "Incoming server settings",
onNext = {},
onBack = {},
viewModel = FakeSaveServerSettingsViewModel(

1
feature/account/edit/src/test/kotlin/app/k9mail/feature/account/edit/ui/server/settings/save/SaveServerSettingsScreenKtTest.kt
View file

@ -27,6 +27,7 @@ class SaveServerSettingsScreenKtTest : ComposeTest() {
setContent {
SaveServerSettingsScreen(
title = "irrelevant",
onNext = { onNextCounter++ },
onBack = { onBackCounter++ },
viewModel = viewModel,