Skip to content

Commit 7e9e5ad

Browse files
authored
Merge pull request #469 from JetBrains/settings-nav
Info screen updates
2 parents 9158353 + efefc6f commit 7e9e5ad

File tree

5 files changed

+10
-11
lines changed

5 files changed

+10
-11
lines changed

shared/src/commonMain/composeResources/values/strings.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@
1616
For the source code and more technical details, visit the GitHub repository.</string>
1717
<string name="about_app_link_github">GitHub repository</string>
1818
<string name="about_app_link_rate">Rate the app</string>
19-
<string name="about_app_link_settings">Settings</string>
20-
<string name="about_app_link_privacy_notice">App Privacy Notice</string>
21-
<string name="about_app_link_terms_of_use">App Terms of Use</string>
19+
<string name="about_app_link_privacy_notice">App privacy notice</string>
20+
<string name="about_app_link_terms_of_use">App terms of use</string>
2221
<string name="about_app_link_licenses">Licenses</string>
2322
<string name="about_app_made_with_junie">Made with Junie</string>
2423

2524
<string name="info_title">Info</string>
2625
<string name="info_link_about_conf">About the conference</string>
2726
<string name="info_link_about_app">About the app</string>
2827
<string name="info_link_partners">Our partners</string>
29-
<string name="info_link_code_of_conduct">Code of Conduct</string>
28+
<string name="info_link_code_of_conduct">Code of conduct</string>
3029
<string name="info_link_news_feed">News feed</string>
30+
<string name="info_link_settings">Settings</string>
3131
<string name="info_link_description_twitter">Twitter</string>
3232
<string name="info_link_description_slack">Slack</string>
3333
<string name="info_link_description_bluesky">Bluesky</string>

shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/navigation/KotlinConfNavHost.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ fun NavGraphBuilder.screens(navController: NavHostController) {
135135
onBack = navController::navigateUp,
136136
onGitHubRepo = { uriHandler.openUri(URLs.GITHUB_REPO) },
137137
onRateApp = { getStoreUrl()?.let { uriHandler.openUri(it) } },
138-
onSettings = { navController.navigate(SettingsScreen) },
139138
onPrivacyNotice = { navController.navigate(AppPrivacyNoticeScreen) },
140139
onTermsOfUse = { navController.navigate(AppTermsOfUseScreen) },
141140
onLicenses = { navController.navigate(LicensesScreen) },

shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/screens/AboutAppScreen.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,11 @@ import kotlinconfapp.shared.generated.resources.about_app_link_github
2626
import kotlinconfapp.shared.generated.resources.about_app_link_licenses
2727
import kotlinconfapp.shared.generated.resources.about_app_link_privacy_notice
2828
import kotlinconfapp.shared.generated.resources.about_app_link_rate
29-
import kotlinconfapp.shared.generated.resources.about_app_link_settings
3029
import kotlinconfapp.shared.generated.resources.about_app_link_terms_of_use
3130
import kotlinconfapp.shared.generated.resources.about_app_made_with_junie
3231
import kotlinconfapp.shared.generated.resources.about_app_title
3332
import kotlinconfapp.shared.generated.resources.app_version
3433
import kotlinconfapp.shared.generated.resources.arrow_up_right_24
35-
import kotlinconfapp.shared.generated.resources.kodee_privacy
3634
import kotlinconfapp.shared.generated.resources.made_with_junie
3735
import org.jetbrains.compose.resources.stringResource
3836
import org.jetbrains.compose.resources.vectorResource
@@ -47,7 +45,6 @@ fun AboutAppScreen(
4745
onBack: () -> Unit,
4846
onGitHubRepo: () -> Unit,
4947
onRateApp: () -> Unit,
50-
onSettings: () -> Unit,
5148
onPrivacyNotice: () -> Unit,
5249
onTermsOfUse: () -> Unit,
5350
onLicenses: () -> Unit,
@@ -80,7 +77,6 @@ fun AboutAppScreen(
8077
)
8178
}
8279

83-
PageMenuItem(stringResource(Res.string.about_app_link_settings), onClick = onSettings)
8480
PageMenuItem(stringResource(Res.string.about_app_link_privacy_notice), onClick = onPrivacyNotice)
8581
PageMenuItem(stringResource(Res.string.about_app_link_terms_of_use), onClick = onTermsOfUse)
8682
PageMenuItem(stringResource(Res.string.about_app_link_licenses), onClick = onLicenses)

shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/screens/InfoScreen.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import kotlinconfapp.shared.generated.resources.info_title
3434
import kotlinconfapp.shared.generated.resources.kotlinconf_by_jetbrains
3535
import kotlinconfapp.shared.generated.resources.slack
3636
import kotlinconfapp.shared.generated.resources.twitter
37+
import kotlinconfapp.shared.generated.resources.info_link_settings
3738
import org.jetbrains.compose.resources.stringResource
3839
import org.jetbrains.compose.resources.vectorResource
3940
import org.jetbrains.kotlinconf.ui.components.Divider
@@ -52,6 +53,7 @@ fun InfoScreen(
5253
onTwitter: () -> Unit,
5354
onSlack: () -> Unit,
5455
onBluesky: () -> Unit,
56+
onSettings: () -> Unit,
5557
) {
5658
Column(Modifier.fillMaxSize().background(color = KotlinConfTheme.colors.mainBackground)) {
5759
MainHeaderTitleBar(stringResource(Res.string.info_title))
@@ -61,8 +63,7 @@ fun InfoScreen(
6163
Modifier
6264
.verticalScroll(rememberScrollState())
6365
.fillMaxSize()
64-
.padding(horizontal = 12.dp)
65-
.padding(bottom = 12.dp),
66+
.padding(12.dp),
6667
verticalArrangement = Arrangement.spacedBy(8.dp),
6768
horizontalAlignment = Alignment.CenterHorizontally,
6869
) {
@@ -75,6 +76,7 @@ fun InfoScreen(
7576
)
7677
PageMenuItem(stringResource(Res.string.info_link_about_conf), onClick = onAboutConf)
7778
PageMenuItem(stringResource(Res.string.info_link_about_app), onClick = onAboutApp)
79+
PageMenuItem(stringResource(Res.string.info_link_settings), onClick = onSettings)
7880
PageMenuItem(stringResource(Res.string.info_link_news_feed), onClick = onNewsFeed)
7981
PageMenuItem(stringResource(Res.string.info_link_partners), onClick = onOurPartners)
8082
PageMenuItem(stringResource(Res.string.info_link_code_of_conduct), onClick = onCodeOfConduct)

shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/screens/MainScreen.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ import org.jetbrains.kotlinconf.navigation.PartnersScreen
5858
import org.jetbrains.kotlinconf.navigation.AppPrivacyNoticePrompt
5959
import org.jetbrains.kotlinconf.navigation.ScheduleScreen
6060
import org.jetbrains.kotlinconf.navigation.SessionScreen
61+
import org.jetbrains.kotlinconf.navigation.SettingsScreen
6162
import org.jetbrains.kotlinconf.navigation.SpeakerDetailScreen
6263
import org.jetbrains.kotlinconf.navigation.SpeakersScreen
6364
import org.jetbrains.kotlinconf.ui.components.Divider
@@ -105,6 +106,7 @@ fun MainScreen(
105106
onTwitter = { uriHandler.openUri(URLs.TWITTER) },
106107
onSlack = { uriHandler.openUri(URLs.SLACK) },
107108
onBluesky = { uriHandler.openUri(URLs.BLUESKY) },
109+
onSettings = { rootNavController.navigate(SettingsScreen) },
108110
)
109111
}
110112
composable<SpeakersScreen> {

0 commit comments

Comments
 (0)