From 302c683956750ad0cc0539da5d81042b3bbd799b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Braun?= Date: Thu, 13 Feb 2025 21:03:45 +0100 Subject: [PATCH] Update "KotlinConf by JetBrains" banner --- .../drawable-dark/hej_its_kotlinconf.xml | 91 ------------------- .../drawable-dark/kotlinconf_by_jetbrains.xml | 40 ++++---- .../drawable/hej_its_kotlinconf.xml | 91 ------------------- .../drawable/kotlinconf_by_jetbrains.xml | 40 ++++---- .../kotlinconf/screens/AboutConference.kt | 5 +- .../kotlinconf/screens/InfoScreen.kt | 16 ++-- 6 files changed, 52 insertions(+), 231 deletions(-) delete mode 100644 shared/src/commonMain/composeResources/drawable-dark/hej_its_kotlinconf.xml delete mode 100644 shared/src/commonMain/composeResources/drawable/hej_its_kotlinconf.xml diff --git a/shared/src/commonMain/composeResources/drawable-dark/hej_its_kotlinconf.xml b/shared/src/commonMain/composeResources/drawable-dark/hej_its_kotlinconf.xml deleted file mode 100644 index 07f34b9c..00000000 --- a/shared/src/commonMain/composeResources/drawable-dark/hej_its_kotlinconf.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/shared/src/commonMain/composeResources/drawable-dark/kotlinconf_by_jetbrains.xml b/shared/src/commonMain/composeResources/drawable-dark/kotlinconf_by_jetbrains.xml index a9a92194..1728a215 100644 --- a/shared/src/commonMain/composeResources/drawable-dark/kotlinconf_by_jetbrains.xml +++ b/shared/src/commonMain/composeResources/drawable-dark/kotlinconf_by_jetbrains.xml @@ -1,16 +1,16 @@ + android:pathData="M77.09,31.91C56.84,11.94 49.46,-0 31.91,0C14.29,0 -0,14.33 -0,32C-0,49.67 14.29,64 31.91,64C49.46,64 56.84,51.94 77.09,31.91Z"> - @@ -19,22 +19,22 @@ - @@ -44,20 +44,20 @@ - @@ -68,6 +68,6 @@ diff --git a/shared/src/commonMain/composeResources/drawable/hej_its_kotlinconf.xml b/shared/src/commonMain/composeResources/drawable/hej_its_kotlinconf.xml deleted file mode 100644 index 9baf218a..00000000 --- a/shared/src/commonMain/composeResources/drawable/hej_its_kotlinconf.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/shared/src/commonMain/composeResources/drawable/kotlinconf_by_jetbrains.xml b/shared/src/commonMain/composeResources/drawable/kotlinconf_by_jetbrains.xml index 09e79bb6..d40e38e0 100644 --- a/shared/src/commonMain/composeResources/drawable/kotlinconf_by_jetbrains.xml +++ b/shared/src/commonMain/composeResources/drawable/kotlinconf_by_jetbrains.xml @@ -1,16 +1,16 @@ + android:pathData="M77.09,31.91C56.84,11.94 49.46,-0 31.91,0C14.29,0 -0,14.33 -0,32C-0,49.67 14.29,64 31.91,64C49.46,64 56.84,51.94 77.09,31.91Z"> - @@ -19,22 +19,22 @@ - @@ -44,20 +44,20 @@ - @@ -68,6 +68,6 @@ diff --git a/shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/screens/AboutConference.kt b/shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/screens/AboutConference.kt index a8f70dbe..88eaa1e9 100644 --- a/shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/screens/AboutConference.kt +++ b/shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/screens/AboutConference.kt @@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.runtime.Composable import androidx.compose.runtime.key @@ -149,7 +150,9 @@ fun AboutConference( Image( painter = painterResource(Res.drawable.kotlinconf_by_jetbrains), contentDescription = stringResource(Res.string.kotlinconf_by_jetbrains_description), - modifier = Modifier.align(Alignment.CenterHorizontally).padding(vertical = 64.dp) + modifier = Modifier.align(Alignment.CenterHorizontally) + .padding(vertical = 64.dp) + .widthIn(max = 360.dp) ) Column( diff --git a/shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/screens/InfoScreen.kt b/shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/screens/InfoScreen.kt index 1320a79a..5549c464 100644 --- a/shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/screens/InfoScreen.kt +++ b/shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/screens/InfoScreen.kt @@ -7,14 +7,14 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.verticalScroll import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.ColorFilter @@ -22,16 +22,16 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.unit.dp import kotlinconfapp.shared.generated.resources.Res import kotlinconfapp.shared.generated.resources.bluesky -import kotlinconfapp.shared.generated.resources.hej_its_kotlinconf import kotlinconfapp.shared.generated.resources.info_link_about_app import kotlinconfapp.shared.generated.resources.info_link_about_conf import kotlinconfapp.shared.generated.resources.info_link_code_of_conduct -import kotlinconfapp.shared.generated.resources.info_link_news_feed import kotlinconfapp.shared.generated.resources.info_link_description_bluesky import kotlinconfapp.shared.generated.resources.info_link_description_slack import kotlinconfapp.shared.generated.resources.info_link_description_twitter +import kotlinconfapp.shared.generated.resources.info_link_news_feed import kotlinconfapp.shared.generated.resources.info_link_partners 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 org.jetbrains.compose.resources.stringResource @@ -63,15 +63,15 @@ fun InfoScreen( .fillMaxSize() .padding(horizontal = 12.dp) .padding(bottom = 12.dp), - verticalArrangement = Arrangement.spacedBy(8.dp) + verticalArrangement = Arrangement.spacedBy(8.dp), + horizontalAlignment = Alignment.CenterHorizontally, ) { Image( - imageVector = vectorResource(Res.drawable.hej_its_kotlinconf), + imageVector = vectorResource(Res.drawable.kotlinconf_by_jetbrains), contentDescription = null, modifier = Modifier .padding(24.dp) - .fillMaxWidth() - .height(124.dp) + .widthIn(max = 360.dp) ) PageMenuItem(stringResource(Res.string.info_link_about_conf), onClick = onAboutConf) PageMenuItem(stringResource(Res.string.info_link_about_app), onClick = onAboutApp)