Merge pull request #496 from JetBrains/custom-res-class-name

Set custom res class name for ui-components resources

Author: zsmb13

gradle/libs.versions.toml

@@ -17,7 +17,7 @@ androidx-work-runtime = "2.10.0"
 coil = "3.2.0-rc02"
 compose-android = "1.8.0"
 compose-hot-reload = "1.0.0-alpha10"
-compose-multiplatform = "1.8.0"
+compose-multiplatform = "1.8.1"
 coroutines = "1.10.1"
 doistx-normalize = "1.2.0"
 exposed = "0.59.0"
@@ -28,7 +28,7 @@ jib = "3.4.4"
 junit = "4.13.2"
 kmpnotifier = "1.5.1"
 koin = "4.1.0-Beta11"
-kotlin = "2.1.20"
+kotlin = "2.1.21"
 kotlinx-datetime = "0.6.2"
 ktor = "3.1.1"
 logbackClassic = "1.5.16"

shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/BaseScreens.kt

@@ -11,7 +11,7 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import kotlinconfapp.ui_components.generated.resources.Res
+import kotlinconfapp.ui_components.generated.resources.UiRes
 import kotlinconfapp.ui_components.generated.resources.arrow_left_24
 import kotlinconfapp.ui_components.generated.resources.main_header_back
 import org.jetbrains.compose.resources.stringResource
@@ -43,8 +43,8 @@ fun ScreenWithTitle(
             title = title,
             startContent = {
                 TopMenuButton(
-                    icon = Res.drawable.arrow_left_24,
-                    contentDescription = stringResource(Res.string.main_header_back),
+                    icon = UiRes.drawable.arrow_left_24,
+                    contentDescription = stringResource(UiRes.string.main_header_back),
                     onClick = onBack,
                 )
             }

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

@@ -32,7 +32,7 @@ import kotlinconfapp.shared.generated.resources.privacy_notice_description
 import kotlinconfapp.shared.generated.resources.privacy_notice_read_action
 import kotlinconfapp.shared.generated.resources.privacy_notice_reject
 import kotlinconfapp.shared.generated.resources.privacy_notice_title
-import kotlinconfapp.ui_components.generated.resources.Res
+import kotlinconfapp.ui_components.generated.resources.UiRes
 import kotlinconfapp.ui_components.generated.resources.arrow_left_24
 import kotlinconfapp.ui_components.generated.resources.arrow_right_24
 import org.jetbrains.compose.resources.ExperimentalResourceApi
@@ -87,7 +87,7 @@ fun AppPrivacyNoticePrompt(
                         stringResource(AppRes.string.privacy_notice_title),
                         startContent = {
                             TopMenuButton(
-                                icon = Res.drawable.arrow_left_24,
+                                icon = UiRes.drawable.arrow_left_24,
                                 contentDescription = stringResource(AppRes.string.privacy_notice_back),
                                 onClick = { detailsVisible = false },
                             )
@@ -140,7 +140,7 @@ fun AppPrivacyNoticePrompt(
                     )
                     Action(
                         stringResource(AppRes.string.privacy_notice_read_action),
-                        icon = Res.drawable.arrow_right_24,
+                        icon = UiRes.drawable.arrow_right_24,
                         size = ActionSize.Large,
                         enabled = true,
                         onClick = { detailsVisible = true }

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

@@ -53,7 +53,7 @@ import org.jetbrains.kotlinconf.utils.plus
 import org.jetbrains.kotlinconf.utils.topInsetPadding
 import org.koin.compose.koinInject
 import kotlin.time.Duration.Companion.seconds
-import kotlinconfapp.ui_components.generated.resources.Res as UiRes
+import kotlinconfapp.ui_components.generated.resources.UiRes
 
 @Composable
 fun DeveloperMenuScreen(

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

@@ -58,7 +58,7 @@ import org.jetbrains.kotlinconf.ui.theme.KotlinConfTheme
 import org.jetbrains.kotlinconf.utils.bottomInsetPadding
 import org.jetbrains.kotlinconf.utils.plus
 import org.koin.compose.viewmodel.koinViewModel
-import kotlinconfapp.ui_components.generated.resources.Res as UiRes
+import kotlinconfapp.ui_components.generated.resources.UiRes
 
 private val Library.licenseName: String
     get() = licenses.firstOrNull()?.name ?: "Unknown license"

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

@@ -30,7 +30,7 @@ import org.jetbrains.kotlinconf.ui.theme.KotlinConfTheme
 import org.jetbrains.kotlinconf.utils.bottomInsetPadding
 import org.jetbrains.kotlinconf.utils.plus
 import org.jetbrains.kotlinconf.utils.topInsetPadding
-import kotlinconfapp.ui_components.generated.resources.Res as UiRes
+import kotlinconfapp.ui_components.generated.resources.UiRes
 
 
 @Composable

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

@@ -95,7 +95,7 @@ import org.jetbrains.kotlinconf.utils.DateTimeFormatting
 import org.jetbrains.kotlinconf.utils.FadingAnimationSpec
 import org.koin.compose.koinInject
 import org.koin.compose.viewmodel.koinViewModel
-import kotlinconfapp.ui_components.generated.resources.Res as UiRes
+import kotlinconfapp.ui_components.generated.resources.UiRes
 
 @Composable
 fun ScheduleScreen(

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

@@ -88,7 +88,7 @@ import org.jetbrains.kotlinconf.utils.bottomInsetPadding
 import org.jetbrains.kotlinconf.utils.topInsetPadding
 import org.koin.compose.viewmodel.koinViewModel
 import org.koin.core.parameter.parametersOf
-import kotlinconfapp.ui_components.generated.resources.Res as UiRes
+import kotlinconfapp.ui_components.generated.resources.UiRes
 
 @OptIn(ExperimentalLayoutApi::class)
 @Composable

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

@@ -22,6 +22,7 @@ import kotlinconfapp.shared.generated.resources.Res
 import kotlinconfapp.shared.generated.resources.schedule_in_x_minutes
 import kotlinconfapp.shared.generated.resources.speaker_detail_error_not_found
 import kotlinconfapp.shared.generated.resources.speaker_detail_title
+import kotlinconfapp.ui_components.generated.resources.UiRes
 import kotlinconfapp.ui_components.generated.resources.arrow_left_24
 import kotlinconfapp.ui_components.generated.resources.main_header_back
 import org.jetbrains.compose.resources.stringResource
@@ -64,8 +65,8 @@ fun SpeakerDetailScreen(
             title = stringResource(Res.string.speaker_detail_title),
             startContent = {
                 TopMenuButton(
-                    icon = kotlinconfapp.ui_components.generated.resources.Res.drawable.arrow_left_24,
-                    contentDescription = stringResource(kotlinconfapp.ui_components.generated.resources.Res.string.main_header_back),
+                    icon = UiRes.drawable.arrow_left_24,
+                    contentDescription = stringResource(UiRes.string.main_header_back),
                     onClick = onBack,
                 )
             }

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

@@ -49,7 +49,7 @@ import org.jetbrains.kotlinconf.ui.components.TopMenuButton
 import org.jetbrains.kotlinconf.ui.theme.KotlinConfTheme
 import org.jetbrains.kotlinconf.utils.FadingAnimationSpec
 import org.koin.compose.viewmodel.koinViewModel
-import kotlinconfapp.ui_components.generated.resources.Res as UiRes
+import kotlinconfapp.ui_components.generated.resources.UiRes
 
 @Composable
 fun SpeakersScreen(