Merge pull request #469 from JetBrains/settings-nav

Info screen updates

Author: zsmb13

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

@@ -16,18 +16,18 @@
 For the source code and more technical details, visit the GitHub repository.</string>
     <string name="about_app_link_github">GitHub repository</string>
     <string name="about_app_link_rate">Rate the app</string>
-    <string name="about_app_link_settings">Settings</string>
-    <string name="about_app_link_privacy_notice">App Privacy Notice</string>
-    <string name="about_app_link_terms_of_use">App Terms of Use</string>
+    <string name="about_app_link_privacy_notice">App privacy notice</string>
+    <string name="about_app_link_terms_of_use">App terms of use</string>
     <string name="about_app_link_licenses">Licenses</string>
     <string name="about_app_made_with_junie">Made with Junie</string>
 
     <string name="info_title">Info</string>
     <string name="info_link_about_conf">About the conference</string>
     <string name="info_link_about_app">About the app</string>
     <string name="info_link_partners">Our partners</string>
-    <string name="info_link_code_of_conduct">Code of Conduct</string>
+    <string name="info_link_code_of_conduct">Code of conduct</string>
     <string name="info_link_news_feed">News feed</string>
+    <string name="info_link_settings">Settings</string>
     <string name="info_link_description_twitter">Twitter</string>
     <string name="info_link_description_slack">Slack</string>
     <string name="info_link_description_bluesky">Bluesky</string>

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

@@ -135,7 +135,6 @@ fun NavGraphBuilder.screens(navController: NavHostController) {
             onBack = navController::navigateUp,
             onGitHubRepo = { uriHandler.openUri(URLs.GITHUB_REPO) },
             onRateApp = { getStoreUrl()?.let { uriHandler.openUri(it) } },
-            onSettings = { navController.navigate(SettingsScreen) },
             onPrivacyNotice = { navController.navigate(AppPrivacyNoticeScreen) },
             onTermsOfUse = { navController.navigate(AppTermsOfUseScreen) },
             onLicenses = { navController.navigate(LicensesScreen) },

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

@@ -26,13 +26,11 @@ import kotlinconfapp.shared.generated.resources.about_app_link_github
 import kotlinconfapp.shared.generated.resources.about_app_link_licenses
 import kotlinconfapp.shared.generated.resources.about_app_link_privacy_notice
 import kotlinconfapp.shared.generated.resources.about_app_link_rate
-import kotlinconfapp.shared.generated.resources.about_app_link_settings
 import kotlinconfapp.shared.generated.resources.about_app_link_terms_of_use
 import kotlinconfapp.shared.generated.resources.about_app_made_with_junie
 import kotlinconfapp.shared.generated.resources.about_app_title
 import kotlinconfapp.shared.generated.resources.app_version
 import kotlinconfapp.shared.generated.resources.arrow_up_right_24
-import kotlinconfapp.shared.generated.resources.kodee_privacy
 import kotlinconfapp.shared.generated.resources.made_with_junie
 import org.jetbrains.compose.resources.stringResource
 import org.jetbrains.compose.resources.vectorResource
@@ -47,7 +45,6 @@ fun AboutAppScreen(
     onBack: () -> Unit,
     onGitHubRepo: () -> Unit,
     onRateApp: () -> Unit,
-    onSettings: () -> Unit,
     onPrivacyNotice: () -> Unit,
     onTermsOfUse: () -> Unit,
     onLicenses: () -> Unit,
@@ -80,7 +77,6 @@ fun AboutAppScreen(
                 )
             }
 
-            PageMenuItem(stringResource(Res.string.about_app_link_settings), onClick = onSettings)
             PageMenuItem(stringResource(Res.string.about_app_link_privacy_notice), onClick = onPrivacyNotice)
             PageMenuItem(stringResource(Res.string.about_app_link_terms_of_use), onClick = onTermsOfUse)
             PageMenuItem(stringResource(Res.string.about_app_link_licenses), onClick = onLicenses)

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

@@ -34,6 +34,7 @@ import kotlinconfapp.shared.generated.resources.info_title
 import kotlinconfapp.shared.generated.resources.kotlinconf_by_jetbrains
 import kotlinconfapp.shared.generated.resources.slack
 import kotlinconfapp.shared.generated.resources.twitter
+import kotlinconfapp.shared.generated.resources.info_link_settings
 import org.jetbrains.compose.resources.stringResource
 import org.jetbrains.compose.resources.vectorResource
 import org.jetbrains.kotlinconf.ui.components.Divider
@@ -52,6 +53,7 @@ fun InfoScreen(
     onTwitter: () -> Unit,
     onSlack: () -> Unit,
     onBluesky: () -> Unit,
+    onSettings: () -> Unit,
 ) {
     Column(Modifier.fillMaxSize().background(color = KotlinConfTheme.colors.mainBackground)) {
         MainHeaderTitleBar(stringResource(Res.string.info_title))
@@ -61,8 +63,7 @@ fun InfoScreen(
             Modifier
                 .verticalScroll(rememberScrollState())
                 .fillMaxSize()
-                .padding(horizontal = 12.dp)
-                .padding(bottom = 12.dp),
+                .padding(12.dp),
             verticalArrangement = Arrangement.spacedBy(8.dp),
             horizontalAlignment = Alignment.CenterHorizontally,
         ) {
@@ -75,6 +76,7 @@ fun InfoScreen(
             )
             PageMenuItem(stringResource(Res.string.info_link_about_conf), onClick = onAboutConf)
             PageMenuItem(stringResource(Res.string.info_link_about_app), onClick = onAboutApp)
+            PageMenuItem(stringResource(Res.string.info_link_settings), onClick = onSettings)
             PageMenuItem(stringResource(Res.string.info_link_news_feed), onClick = onNewsFeed)
             PageMenuItem(stringResource(Res.string.info_link_partners), onClick = onOurPartners)
             PageMenuItem(stringResource(Res.string.info_link_code_of_conduct), onClick = onCodeOfConduct)

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

@@ -58,6 +58,7 @@ import org.jetbrains.kotlinconf.navigation.PartnersScreen
 import org.jetbrains.kotlinconf.navigation.AppPrivacyNoticePrompt
 import org.jetbrains.kotlinconf.navigation.ScheduleScreen
 import org.jetbrains.kotlinconf.navigation.SessionScreen
+import org.jetbrains.kotlinconf.navigation.SettingsScreen
 import org.jetbrains.kotlinconf.navigation.SpeakerDetailScreen
 import org.jetbrains.kotlinconf.navigation.SpeakersScreen
 import org.jetbrains.kotlinconf.ui.components.Divider
@@ -105,6 +106,7 @@ fun MainScreen(
                     onTwitter = { uriHandler.openUri(URLs.TWITTER) },
                     onSlack = { uriHandler.openUri(URLs.SLACK) },
                     onBluesky = { uriHandler.openUri(URLs.BLUESKY) },
+                    onSettings = { rootNavController.navigate(SettingsScreen) },
                 )
             }
             composable<SpeakersScreen> {