From f77487ea266b4f2e96053026859743733b65035f Mon Sep 17 00:00:00 2001 From: todayama_r <13657682+Corvus400@users.noreply.github.com> Date: Fri, 23 Aug 2024 04:03:48 +0900 Subject: [PATCH] :wrench: Modifier issues on the iosMain side of the code have been addressed. https://github.com/DroidKaigi/conference-app-2024/issues/485#issuecomment-2304251937 --- app-android/build.gradle.kts | 2 +- app-ios-shared/build.gradle.kts | 2 +- core/{ui => droidkaigiui}/.gitignore | 0 core/{ui => droidkaigiui}/build.gradle.kts | 4 +++- core/{ui => droidkaigiui}/proguard-rules.pro | 0 .../confsched/ui/CanShowLargeVector.android.kt | 0 .../confsched/ui/ErrorAndRetryActionHandler.kt | 0 .../confsched/ui/MessageStateHolderModule.kt | 0 .../ui/ProvideAboutHeaderPainter.android.kt | 6 +++--- .../confsched/ui/RandomUUID.android.kt | 0 .../confsched/ui/ScreenInfo.android.kt | 0 .../confsched/ui/TestEnvironment.android.kt | 0 .../res/drawable/anim_header_title.xml | 0 .../drawable/about_header_title.xml | 0 .../drawable/about_header_year.xml | 0 .../composeResources/values-ja/strings.xml | 0 .../composeResources/values/strings.xml | 0 .../droidkaigi/confsched/ui/AppErrorMapper.kt | 0 .../confsched/ui/CanShowLargeVector.kt | 0 .../confsched/ui/ComposeResourceErrorMessage.kt | 4 ++-- .../droidkaigi/confsched/ui/DroidKaigiUiRes.kt} | 4 ++-- .../confsched/ui/ErrorAndRetryHandler.kt | 0 .../droidkaigi/confsched/ui/ImagePainter.kt | 0 .../droidkaigi/confsched/ui/ModifierExt.kt | 0 .../confsched/ui/NavHostWithSharedAxisX.kt | 0 .../droidkaigi/confsched/ui/OnClickHandler.kt | 0 .../droidkaigi/confsched/ui/PaddingValuesExt.kt | 0 .../confsched/ui/PresenterDefaultsProvider.kt | 0 .../droidkaigi/confsched/ui/PreviewOverrider.kt | 0 .../confsched/ui/ProvideAboutHeaderPainter.kt | 0 .../github/droidkaigi/confsched/ui/RandomUUID.kt | 0 .../confsched/ui/RememberNavigationArgument.kt | 0 .../droidkaigi/confsched/ui/RoomIconExt.kt | 0 .../github/droidkaigi/confsched/ui/ScreenInfo.kt | 0 .../droidkaigi/confsched/ui/TestEnvironment.kt | 0 .../droidkaigi/confsched/ui/TimetableRoomExt.kt | 0 .../droidkaigi/confsched/ui/UiStateBuilder.kt | 0 .../droidkaigi/confsched/ui/UserMessage.kt | 0 .../confsched/ui/animation/FavoriteAnimation.kt | 0 .../ui/animation/FavoriteAnimationModifier.kt | 0 .../ui/animation/FavoriteAnimationScope.kt | 0 .../ui/component/AnimatedLargeTopAppBar.kt | 0 .../ui/component/AnimatedTextTopAppBar.kt | 0 .../confsched/ui/component/TimetableItemCard.kt | 16 ++++++++-------- .../confsched/ui/component/TimetableItemTag.kt | 0 .../confsched/ui/component/TimetableTime.kt | 0 .../LocalAnimatedVisibilityScope.kt | 0 .../confsched/ui/compositionlocal/LocalClock.kt | 0 .../LocalSharedTransitionScope.kt | 0 .../confsched/ui/CanShowLargeVector.ios.kt | 0 .../droidkaigi/confsched/ui/IosComposeAdapter.kt | 0 .../ui/ProvideAboutHeaderPainter.ios.kt | 4 ++-- .../droidkaigi/confsched/ui/RandomUUID.ios.kt | 0 .../droidkaigi/confsched/ui/ScreenInfo.ios.kt | 0 .../confsched/ui/TestEnvironment.ios.kt | 0 core/testing-manifest/build.gradle.kts | 2 +- core/testing/build.gradle.kts | 2 +- feature/about/build.gradle.kts | 2 +- .../about/section/AboutDroidKaigiDetail.kt | 6 +++--- feature/contributors/build.gradle.kts | 2 +- feature/eventmap/build.gradle.kts | 2 +- feature/favorites/build.gradle.kts | 2 +- feature/main/build.gradle.kts | 2 +- feature/profilecard/build.gradle.kts | 2 +- feature/sessions/build.gradle.kts | 2 +- feature/settings/build.gradle.kts | 2 +- feature/sponsors/build.gradle.kts | 2 +- feature/staff/build.gradle.kts | 2 +- settings.gradle.kts | 2 +- 69 files changed, 38 insertions(+), 36 deletions(-) rename core/{ui => droidkaigiui}/.gitignore (100%) rename core/{ui => droidkaigiui}/build.gradle.kts (77%) rename core/{ui => droidkaigiui}/proguard-rules.pro (100%) rename core/{ui => droidkaigiui}/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/CanShowLargeVector.android.kt (100%) rename core/{ui => droidkaigiui}/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/ErrorAndRetryActionHandler.kt (100%) rename core/{ui => droidkaigiui}/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/MessageStateHolderModule.kt (100%) rename core/{ui => droidkaigiui}/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/ProvideAboutHeaderPainter.android.kt (85%) rename core/{ui => droidkaigiui}/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/RandomUUID.android.kt (100%) rename core/{ui => droidkaigiui}/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/ScreenInfo.android.kt (100%) rename core/{ui => droidkaigiui}/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnvironment.android.kt (100%) rename core/{ui => droidkaigiui}/src/androidMain/res/drawable/anim_header_title.xml (100%) rename core/{ui => droidkaigiui}/src/commonMain/composeResources/drawable/about_header_title.xml (100%) rename core/{ui => droidkaigiui}/src/commonMain/composeResources/drawable/about_header_year.xml (100%) rename core/{ui => droidkaigiui}/src/commonMain/composeResources/values-ja/strings.xml (100%) rename core/{ui => droidkaigiui}/src/commonMain/composeResources/values/strings.xml (100%) rename core/{ui => droidkaigiui}/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/AppErrorMapper.kt (100%) rename core/{ui => droidkaigiui}/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/CanShowLargeVector.kt (100%) rename core/{ui => droidkaigiui}/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/ComposeResourceErrorMessage.kt (83%) rename core/{ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/UiRes.kt => droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/DroidKaigiUiRes.kt} (53%) rename core/{ui => droidkaigiui}/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/ErrorAndRetryHandler.kt (100%) rename core/{ui => droidkaigiui}/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/ImagePainter.kt (100%) rename core/{ui => droidkaigiui}/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/ModifierExt.kt (100%) rename core/{ui => droidkaigiui}/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/NavHostWithSharedAxisX.kt (100%) rename core/{ui => droidkaigiui}/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/OnClickHandler.kt (100%) rename core/{ui => droidkaigiui}/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/PaddingValuesExt.kt (100%) rename core/{ui => droidkaigiui}/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/PresenterDefaultsProvider.kt (100%) rename core/{ui => droidkaigiui}/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/PreviewOverrider.kt (100%) rename core/{ui => droidkaigiui}/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/ProvideAboutHeaderPainter.kt (100%) rename core/{ui => droidkaigiui}/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/RandomUUID.kt (100%) rename core/{ui => droidkaigiui}/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/RememberNavigationArgument.kt (100%) rename core/{ui => droidkaigiui}/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/RoomIconExt.kt (100%) rename core/{ui => droidkaigiui}/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/ScreenInfo.kt (100%) rename core/{ui => droidkaigiui}/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnvironment.kt (100%) rename core/{ui => droidkaigiui}/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/TimetableRoomExt.kt (100%) rename core/{ui => droidkaigiui}/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/UiStateBuilder.kt (100%) rename core/{ui => droidkaigiui}/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/UserMessage.kt (100%) rename core/{ui => droidkaigiui}/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/animation/FavoriteAnimation.kt (100%) rename core/{ui => droidkaigiui}/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/animation/FavoriteAnimationModifier.kt (100%) rename core/{ui => droidkaigiui}/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/animation/FavoriteAnimationScope.kt (100%) rename core/{ui => droidkaigiui}/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/AnimatedLargeTopAppBar.kt (100%) rename core/{ui => droidkaigiui}/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/AnimatedTextTopAppBar.kt (100%) rename core/{ui => droidkaigiui}/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/TimetableItemCard.kt (95%) rename core/{ui => droidkaigiui}/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/TimetableItemTag.kt (100%) rename core/{ui => droidkaigiui}/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/TimetableTime.kt (100%) rename core/{ui => droidkaigiui}/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/compositionlocal/LocalAnimatedVisibilityScope.kt (100%) rename core/{ui => droidkaigiui}/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/compositionlocal/LocalClock.kt (100%) rename core/{ui => droidkaigiui}/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/compositionlocal/LocalSharedTransitionScope.kt (100%) rename core/{ui => droidkaigiui}/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/CanShowLargeVector.ios.kt (100%) rename core/{ui => droidkaigiui}/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/IosComposeAdapter.kt (100%) rename core/{ui => droidkaigiui}/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/ProvideAboutHeaderPainter.ios.kt (64%) rename core/{ui => droidkaigiui}/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/RandomUUID.ios.kt (100%) rename core/{ui => droidkaigiui}/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/ScreenInfo.ios.kt (100%) rename core/{ui => droidkaigiui}/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnvironment.ios.kt (100%) diff --git a/app-android/build.gradle.kts b/app-android/build.gradle.kts index 0627ca352..41a47b35f 100644 --- a/app-android/build.gradle.kts +++ b/app-android/build.gradle.kts @@ -108,7 +108,7 @@ dependencies { implementation(projects.core.model) implementation(projects.core.data) implementation(projects.core.designsystem) - implementation(projects.core.ui) + implementation(projects.core.droidkaigiui) implementation(libs.composeNavigation) implementation(libs.composeHiltNavigation) implementation(libs.composeMaterialWindowSize) diff --git a/app-ios-shared/build.gradle.kts b/app-ios-shared/build.gradle.kts index 21867c1e1..0c1f26cd8 100644 --- a/app-ios-shared/build.gradle.kts +++ b/app-ios-shared/build.gradle.kts @@ -52,7 +52,7 @@ kotlin { dependencies { api(projects.core.model) api(projects.core.data) - api(projects.core.ui) + api(projects.core.droidkaigiui) api(projects.feature.main) api(projects.feature.sessions) api(projects.feature.eventmap) diff --git a/core/ui/.gitignore b/core/droidkaigiui/.gitignore similarity index 100% rename from core/ui/.gitignore rename to core/droidkaigiui/.gitignore diff --git a/core/ui/build.gradle.kts b/core/droidkaigiui/build.gradle.kts similarity index 77% rename from core/ui/build.gradle.kts rename to core/droidkaigiui/build.gradle.kts index 1bb81078d..a9cfbd7ef 100644 --- a/core/ui/build.gradle.kts +++ b/core/droidkaigiui/build.gradle.kts @@ -7,7 +7,9 @@ plugins { id("droidkaigi.primitive.detekt") } -android.namespace = "io.github.droidkaigi.confsched.core.ui" +// https://github.com/DroidKaigi/conference-app-2024/issues/485#issuecomment-2304251937 +// (KT-66568)[https://youtrack.jetbrains.com/issue/KT-66568/w-KLIB-resolver-The-same-uniquename...-found-in-more-than-one-library] +android.namespace = "io.github.droidkaigi.confsched.core.droidkaigiui" kotlin { sourceSets { diff --git a/core/ui/proguard-rules.pro b/core/droidkaigiui/proguard-rules.pro similarity index 100% rename from core/ui/proguard-rules.pro rename to core/droidkaigiui/proguard-rules.pro diff --git a/core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/CanShowLargeVector.android.kt b/core/droidkaigiui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/CanShowLargeVector.android.kt similarity index 100% rename from core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/CanShowLargeVector.android.kt rename to core/droidkaigiui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/CanShowLargeVector.android.kt diff --git a/core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/ErrorAndRetryActionHandler.kt b/core/droidkaigiui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/ErrorAndRetryActionHandler.kt similarity index 100% rename from core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/ErrorAndRetryActionHandler.kt rename to core/droidkaigiui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/ErrorAndRetryActionHandler.kt diff --git a/core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/MessageStateHolderModule.kt b/core/droidkaigiui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/MessageStateHolderModule.kt similarity index 100% rename from core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/MessageStateHolderModule.kt rename to core/droidkaigiui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/MessageStateHolderModule.kt diff --git a/core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/ProvideAboutHeaderPainter.android.kt b/core/droidkaigiui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/ProvideAboutHeaderPainter.android.kt similarity index 85% rename from core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/ProvideAboutHeaderPainter.android.kt rename to core/droidkaigiui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/ProvideAboutHeaderPainter.android.kt index 1912eb057..2cd74e3b7 100644 --- a/core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/ProvideAboutHeaderPainter.android.kt +++ b/core/droidkaigiui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/ProvideAboutHeaderPainter.android.kt @@ -11,8 +11,8 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.graphics.painter.Painter -import conference_app_2024.core.ui.generated.resources.about_header_title -import io.github.droidkaigi.confsched.core.ui.R +import conference_app_2024.core.droidkaigiui.generated.resources.about_header_title +import io.github.droidkaigi.confsched.core.droidkaigiui.R import org.jetbrains.compose.resources.painterResource @OptIn(ExperimentalAnimationGraphicsApi::class) @@ -32,6 +32,6 @@ actual fun provideAboutHeaderTitlePainter(enableAnimation: Boolean): Painter { painter } else { - painterResource(UiRes.drawable.about_header_title) + painterResource(DroidKaigiUiRes.drawable.about_header_title) } } diff --git a/core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/RandomUUID.android.kt b/core/droidkaigiui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/RandomUUID.android.kt similarity index 100% rename from core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/RandomUUID.android.kt rename to core/droidkaigiui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/RandomUUID.android.kt diff --git a/core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/ScreenInfo.android.kt b/core/droidkaigiui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/ScreenInfo.android.kt similarity index 100% rename from core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/ScreenInfo.android.kt rename to core/droidkaigiui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/ScreenInfo.android.kt diff --git a/core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnvironment.android.kt b/core/droidkaigiui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnvironment.android.kt similarity index 100% rename from core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnvironment.android.kt rename to core/droidkaigiui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnvironment.android.kt diff --git a/core/ui/src/androidMain/res/drawable/anim_header_title.xml b/core/droidkaigiui/src/androidMain/res/drawable/anim_header_title.xml similarity index 100% rename from core/ui/src/androidMain/res/drawable/anim_header_title.xml rename to core/droidkaigiui/src/androidMain/res/drawable/anim_header_title.xml diff --git a/core/ui/src/commonMain/composeResources/drawable/about_header_title.xml b/core/droidkaigiui/src/commonMain/composeResources/drawable/about_header_title.xml similarity index 100% rename from core/ui/src/commonMain/composeResources/drawable/about_header_title.xml rename to core/droidkaigiui/src/commonMain/composeResources/drawable/about_header_title.xml diff --git a/core/ui/src/commonMain/composeResources/drawable/about_header_year.xml b/core/droidkaigiui/src/commonMain/composeResources/drawable/about_header_year.xml similarity index 100% rename from core/ui/src/commonMain/composeResources/drawable/about_header_year.xml rename to core/droidkaigiui/src/commonMain/composeResources/drawable/about_header_year.xml diff --git a/core/ui/src/commonMain/composeResources/values-ja/strings.xml b/core/droidkaigiui/src/commonMain/composeResources/values-ja/strings.xml similarity index 100% rename from core/ui/src/commonMain/composeResources/values-ja/strings.xml rename to core/droidkaigiui/src/commonMain/composeResources/values-ja/strings.xml diff --git a/core/ui/src/commonMain/composeResources/values/strings.xml b/core/droidkaigiui/src/commonMain/composeResources/values/strings.xml similarity index 100% rename from core/ui/src/commonMain/composeResources/values/strings.xml rename to core/droidkaigiui/src/commonMain/composeResources/values/strings.xml diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/AppErrorMapper.kt b/core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/AppErrorMapper.kt similarity index 100% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/AppErrorMapper.kt rename to core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/AppErrorMapper.kt diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/CanShowLargeVector.kt b/core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/CanShowLargeVector.kt similarity index 100% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/CanShowLargeVector.kt rename to core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/CanShowLargeVector.kt diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/ComposeResourceErrorMessage.kt b/core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/ComposeResourceErrorMessage.kt similarity index 83% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/ComposeResourceErrorMessage.kt rename to core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/ComposeResourceErrorMessage.kt index 7e506ec0b..e68431472 100644 --- a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/ComposeResourceErrorMessage.kt +++ b/core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/ComposeResourceErrorMessage.kt @@ -1,7 +1,7 @@ package io.github.droidkaigi.confsched.ui import androidx.compose.runtime.Composable -import conference_app_2024.core.ui.generated.resources.connection_failed +import conference_app_2024.core.droidkaigiui.generated.resources.connection_failed import io.github.droidkaigi.confsched.model.AppError import io.github.droidkaigi.confsched.model.AppError.InternetConnectionException import org.jetbrains.compose.resources.stringResource @@ -14,7 +14,7 @@ import kotlin.reflect.KClass internal fun composeResourceErrorMessages(): List = listOf( ComposeResourceErrorMessage( InternetConnectionException::class, - stringResource(UiRes.string.connection_failed), + stringResource(DroidKaigiUiRes.string.connection_failed), ), ) diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/UiRes.kt b/core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/DroidKaigiUiRes.kt similarity index 53% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/UiRes.kt rename to core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/DroidKaigiUiRes.kt index 1a0f693d4..1c4e0fae6 100644 --- a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/UiRes.kt +++ b/core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/DroidKaigiUiRes.kt @@ -1,8 +1,8 @@ package io.github.droidkaigi.confsched.ui -import conference_app_2024.core.ui.generated.resources.Res +import conference_app_2024.core.droidkaigiui.generated.resources.Res -object UiRes { +object DroidKaigiUiRes { val string = Res.string val drawable = Res.drawable } diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/ErrorAndRetryHandler.kt b/core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/ErrorAndRetryHandler.kt similarity index 100% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/ErrorAndRetryHandler.kt rename to core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/ErrorAndRetryHandler.kt diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/ImagePainter.kt b/core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/ImagePainter.kt similarity index 100% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/ImagePainter.kt rename to core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/ImagePainter.kt diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/ModifierExt.kt b/core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/ModifierExt.kt similarity index 100% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/ModifierExt.kt rename to core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/ModifierExt.kt diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/NavHostWithSharedAxisX.kt b/core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/NavHostWithSharedAxisX.kt similarity index 100% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/NavHostWithSharedAxisX.kt rename to core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/NavHostWithSharedAxisX.kt diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/OnClickHandler.kt b/core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/OnClickHandler.kt similarity index 100% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/OnClickHandler.kt rename to core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/OnClickHandler.kt diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/PaddingValuesExt.kt b/core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/PaddingValuesExt.kt similarity index 100% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/PaddingValuesExt.kt rename to core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/PaddingValuesExt.kt diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/PresenterDefaultsProvider.kt b/core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/PresenterDefaultsProvider.kt similarity index 100% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/PresenterDefaultsProvider.kt rename to core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/PresenterDefaultsProvider.kt diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/PreviewOverrider.kt b/core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/PreviewOverrider.kt similarity index 100% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/PreviewOverrider.kt rename to core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/PreviewOverrider.kt diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/ProvideAboutHeaderPainter.kt b/core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/ProvideAboutHeaderPainter.kt similarity index 100% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/ProvideAboutHeaderPainter.kt rename to core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/ProvideAboutHeaderPainter.kt diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/RandomUUID.kt b/core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/RandomUUID.kt similarity index 100% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/RandomUUID.kt rename to core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/RandomUUID.kt diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/RememberNavigationArgument.kt b/core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/RememberNavigationArgument.kt similarity index 100% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/RememberNavigationArgument.kt rename to core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/RememberNavigationArgument.kt diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/RoomIconExt.kt b/core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/RoomIconExt.kt similarity index 100% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/RoomIconExt.kt rename to core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/RoomIconExt.kt diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/ScreenInfo.kt b/core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/ScreenInfo.kt similarity index 100% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/ScreenInfo.kt rename to core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/ScreenInfo.kt diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnvironment.kt b/core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnvironment.kt similarity index 100% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnvironment.kt rename to core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnvironment.kt diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/TimetableRoomExt.kt b/core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/TimetableRoomExt.kt similarity index 100% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/TimetableRoomExt.kt rename to core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/TimetableRoomExt.kt diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/UiStateBuilder.kt b/core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/UiStateBuilder.kt similarity index 100% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/UiStateBuilder.kt rename to core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/UiStateBuilder.kt diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/UserMessage.kt b/core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/UserMessage.kt similarity index 100% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/UserMessage.kt rename to core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/UserMessage.kt diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/animation/FavoriteAnimation.kt b/core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/animation/FavoriteAnimation.kt similarity index 100% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/animation/FavoriteAnimation.kt rename to core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/animation/FavoriteAnimation.kt diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/animation/FavoriteAnimationModifier.kt b/core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/animation/FavoriteAnimationModifier.kt similarity index 100% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/animation/FavoriteAnimationModifier.kt rename to core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/animation/FavoriteAnimationModifier.kt diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/animation/FavoriteAnimationScope.kt b/core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/animation/FavoriteAnimationScope.kt similarity index 100% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/animation/FavoriteAnimationScope.kt rename to core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/animation/FavoriteAnimationScope.kt diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/AnimatedLargeTopAppBar.kt b/core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/AnimatedLargeTopAppBar.kt similarity index 100% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/AnimatedLargeTopAppBar.kt rename to core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/AnimatedLargeTopAppBar.kt diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/AnimatedTextTopAppBar.kt b/core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/AnimatedTextTopAppBar.kt similarity index 100% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/AnimatedTextTopAppBar.kt rename to core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/AnimatedTextTopAppBar.kt diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/TimetableItemCard.kt b/core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/TimetableItemCard.kt similarity index 95% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/TimetableItemCard.kt rename to core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/TimetableItemCard.kt index 37013b199..df5bca61e 100644 --- a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/TimetableItemCard.kt +++ b/core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/TimetableItemCard.kt @@ -43,14 +43,14 @@ import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import conference_app_2024.core.ui.generated.resources.bookmarked -import conference_app_2024.core.ui.generated.resources.image -import conference_app_2024.core.ui.generated.resources.not_bookmarked +import conference_app_2024.core.droidkaigiui.generated.resources.bookmarked +import conference_app_2024.core.droidkaigiui.generated.resources.image +import conference_app_2024.core.droidkaigiui.generated.resources.not_bookmarked import io.github.droidkaigi.confsched.designsystem.theme.ProvideRoomTheme import io.github.droidkaigi.confsched.designsystem.theme.primaryFixed import io.github.droidkaigi.confsched.model.TimetableItem import io.github.droidkaigi.confsched.model.TimetableItem.Session -import io.github.droidkaigi.confsched.ui.UiRes +import io.github.droidkaigi.confsched.ui.DroidKaigiUiRes import io.github.droidkaigi.confsched.ui.animation.LocalFavoriteAnimationScope import io.github.droidkaigi.confsched.ui.rememberAsyncImagePainter import org.jetbrains.compose.resources.stringResource @@ -136,7 +136,7 @@ fun TimetableItemCard( BorderStroke(1.dp, MaterialTheme.colorScheme.outline), CircleShape, ), - contentDescription = stringResource(UiRes.string.image), + contentDescription = stringResource(DroidKaigiUiRes.string.image), ) Text( text = speaker.name, @@ -160,7 +160,7 @@ fun TimetableItemCard( ) { Icon( Icons.Filled.Info, - contentDescription = stringResource(UiRes.string.image), + contentDescription = stringResource(DroidKaigiUiRes.string.image), tint = MaterialTheme.colorScheme.error, ) Text( @@ -208,7 +208,7 @@ private fun FavoriteButton( if (isBookmarked) { Icon( Filled.Favorite, - contentDescription = stringResource(UiRes.string.bookmarked), + contentDescription = stringResource(DroidKaigiUiRes.string.bookmarked), tint = MaterialTheme.colorScheme.primaryFixed, modifier = Modifier .testTag(TimetableItemCardBookmarkedIconTestTag), @@ -216,7 +216,7 @@ private fun FavoriteButton( } else { Icon( Outlined.FavoriteBorder, - contentDescription = stringResource(UiRes.string.not_bookmarked), + contentDescription = stringResource(DroidKaigiUiRes.string.not_bookmarked), tint = MaterialTheme.colorScheme.onSurfaceVariant, ) } diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/TimetableItemTag.kt b/core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/TimetableItemTag.kt similarity index 100% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/TimetableItemTag.kt rename to core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/TimetableItemTag.kt diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/TimetableTime.kt b/core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/TimetableTime.kt similarity index 100% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/TimetableTime.kt rename to core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/TimetableTime.kt diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/compositionlocal/LocalAnimatedVisibilityScope.kt b/core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/compositionlocal/LocalAnimatedVisibilityScope.kt similarity index 100% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/compositionlocal/LocalAnimatedVisibilityScope.kt rename to core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/compositionlocal/LocalAnimatedVisibilityScope.kt diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/compositionlocal/LocalClock.kt b/core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/compositionlocal/LocalClock.kt similarity index 100% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/compositionlocal/LocalClock.kt rename to core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/compositionlocal/LocalClock.kt diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/compositionlocal/LocalSharedTransitionScope.kt b/core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/compositionlocal/LocalSharedTransitionScope.kt similarity index 100% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/compositionlocal/LocalSharedTransitionScope.kt rename to core/droidkaigiui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/compositionlocal/LocalSharedTransitionScope.kt diff --git a/core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/CanShowLargeVector.ios.kt b/core/droidkaigiui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/CanShowLargeVector.ios.kt similarity index 100% rename from core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/CanShowLargeVector.ios.kt rename to core/droidkaigiui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/CanShowLargeVector.ios.kt diff --git a/core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/IosComposeAdapter.kt b/core/droidkaigiui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/IosComposeAdapter.kt similarity index 100% rename from core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/IosComposeAdapter.kt rename to core/droidkaigiui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/IosComposeAdapter.kt diff --git a/core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/ProvideAboutHeaderPainter.ios.kt b/core/droidkaigiui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/ProvideAboutHeaderPainter.ios.kt similarity index 64% rename from core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/ProvideAboutHeaderPainter.ios.kt rename to core/droidkaigiui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/ProvideAboutHeaderPainter.ios.kt index 1c8439bf1..21ab38da8 100644 --- a/core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/ProvideAboutHeaderPainter.ios.kt +++ b/core/droidkaigiui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/ProvideAboutHeaderPainter.ios.kt @@ -2,10 +2,10 @@ package io.github.droidkaigi.confsched.ui import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.painter.Painter -import conference_app_2024.core.ui.generated.resources.about_header_title +import conference_app_2024.core.droidkaigiui.generated.resources.about_header_title import org.jetbrains.compose.resources.painterResource @Composable actual fun provideAboutHeaderTitlePainter(enableAnimation: Boolean): Painter { - return painterResource(UiRes.drawable.about_header_title) + return painterResource(DroidKaigiUiRes.drawable.about_header_title) } diff --git a/core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/RandomUUID.ios.kt b/core/droidkaigiui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/RandomUUID.ios.kt similarity index 100% rename from core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/RandomUUID.ios.kt rename to core/droidkaigiui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/RandomUUID.ios.kt diff --git a/core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/ScreenInfo.ios.kt b/core/droidkaigiui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/ScreenInfo.ios.kt similarity index 100% rename from core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/ScreenInfo.ios.kt rename to core/droidkaigiui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/ScreenInfo.ios.kt diff --git a/core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnvironment.ios.kt b/core/droidkaigiui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnvironment.ios.kt similarity index 100% rename from core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnvironment.ios.kt rename to core/droidkaigiui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnvironment.ios.kt diff --git a/core/testing-manifest/build.gradle.kts b/core/testing-manifest/build.gradle.kts index 5a217b1e5..445bf096b 100644 --- a/core/testing-manifest/build.gradle.kts +++ b/core/testing-manifest/build.gradle.kts @@ -7,5 +7,5 @@ plugins { android.namespace = "io.github.droidkaigi.confsched.core.testing" dependencies { - implementation(projects.core.ui) + implementation(projects.core.droidkaigiui) } diff --git a/core/testing/build.gradle.kts b/core/testing/build.gradle.kts index 335fdbb27..a1a851932 100644 --- a/core/testing/build.gradle.kts +++ b/core/testing/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { implementation(projects.core.model) implementation(projects.core.designsystem) implementation(projects.core.data) - implementation(projects.core.ui) + implementation(projects.core.droidkaigiui) implementation(projects.feature.main) implementation(projects.feature.sessions) implementation(projects.feature.profilecard) diff --git a/feature/about/build.gradle.kts b/feature/about/build.gradle.kts index 726df90cb..bb6308ea1 100644 --- a/feature/about/build.gradle.kts +++ b/feature/about/build.gradle.kts @@ -9,7 +9,7 @@ kotlin { commonMain { dependencies { implementation(projects.core.designsystem) - implementation(projects.core.ui) + implementation(projects.core.droidkaigiui) implementation(projects.core.model) implementation(libs.composeNavigation) diff --git a/feature/about/src/commonMain/kotlin/io/github/droidkaigi/confsched/about/section/AboutDroidKaigiDetail.kt b/feature/about/src/commonMain/kotlin/io/github/droidkaigi/confsched/about/section/AboutDroidKaigiDetail.kt index c68d5813e..f9b8c6589 100644 --- a/feature/about/src/commonMain/kotlin/io/github/droidkaigi/confsched/about/section/AboutDroidKaigiDetail.kt +++ b/feature/about/src/commonMain/kotlin/io/github/droidkaigi/confsched/about/section/AboutDroidKaigiDetail.kt @@ -21,12 +21,12 @@ import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.testTag import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import conference_app_2024.core.ui.generated.resources.about_header_year +import conference_app_2024.core.droidkaigiui.generated.resources.about_header_year import conference_app_2024.feature.about.generated.resources.description import io.github.droidkaigi.confsched.about.AboutRes import io.github.droidkaigi.confsched.about.component.AboutDroidKaigiDetailSummaryCard import io.github.droidkaigi.confsched.designsystem.theme.KaigiTheme -import io.github.droidkaigi.confsched.ui.UiRes +import io.github.droidkaigi.confsched.ui.DroidKaigiUiRes import io.github.droidkaigi.confsched.ui.canShowLargeVector import io.github.droidkaigi.confsched.ui.provideAboutHeaderTitlePainter import org.jetbrains.compose.resources.painterResource @@ -74,7 +74,7 @@ fun AboutDroidKaigiDetail( Modifier } Image( - painter = painterResource(UiRes.drawable.about_header_year), + painter = painterResource(DroidKaigiUiRes.drawable.about_header_year), contentDescription = null, contentScale = ContentScale.FillWidth, modifier = imageModifier, diff --git a/feature/contributors/build.gradle.kts b/feature/contributors/build.gradle.kts index 2234712a1..59df0835f 100644 --- a/feature/contributors/build.gradle.kts +++ b/feature/contributors/build.gradle.kts @@ -9,7 +9,7 @@ kotlin { commonMain { dependencies { implementation(projects.core.model) - implementation(projects.core.ui) + implementation(projects.core.droidkaigiui) implementation(libs.kotlinxCoroutinesCore) implementation(projects.core.designsystem) implementation(libs.moleculeRuntime) diff --git a/feature/eventmap/build.gradle.kts b/feature/eventmap/build.gradle.kts index 03f83a062..3cf0a626c 100644 --- a/feature/eventmap/build.gradle.kts +++ b/feature/eventmap/build.gradle.kts @@ -10,7 +10,7 @@ kotlin { commonMain { dependencies { implementation(projects.core.model) - implementation(projects.core.ui) + implementation(projects.core.droidkaigiui) implementation(projects.core.designsystem) implementation(libs.kotlinxCoroutinesCore) diff --git a/feature/favorites/build.gradle.kts b/feature/favorites/build.gradle.kts index 3f0523d72..7f8ac249b 100644 --- a/feature/favorites/build.gradle.kts +++ b/feature/favorites/build.gradle.kts @@ -9,7 +9,7 @@ kotlin { commonMain { dependencies { implementation(projects.core.model) - implementation(projects.core.ui) + implementation(projects.core.droidkaigiui) implementation(libs.kotlinxCoroutinesCore) implementation(projects.core.designsystem) implementation(libs.moleculeRuntime) diff --git a/feature/main/build.gradle.kts b/feature/main/build.gradle.kts index a03e2ea25..f0461f508 100644 --- a/feature/main/build.gradle.kts +++ b/feature/main/build.gradle.kts @@ -12,7 +12,7 @@ kotlin { implementation(compose.materialIconsExtended) implementation(projects.core.model) implementation(projects.core.designsystem) - implementation(projects.core.ui) + implementation(projects.core.droidkaigiui) implementation(libs.haze) } } diff --git a/feature/profilecard/build.gradle.kts b/feature/profilecard/build.gradle.kts index 8115ba6ab..6ac70ec10 100644 --- a/feature/profilecard/build.gradle.kts +++ b/feature/profilecard/build.gradle.kts @@ -10,7 +10,7 @@ kotlin { commonMain { dependencies { implementation(projects.core.designsystem) - implementation(projects.core.ui) + implementation(projects.core.droidkaigiui) implementation(projects.core.model) implementation(libs.composeNavigation) diff --git a/feature/sessions/build.gradle.kts b/feature/sessions/build.gradle.kts index c81c93e5e..eb5c5d607 100644 --- a/feature/sessions/build.gradle.kts +++ b/feature/sessions/build.gradle.kts @@ -11,7 +11,7 @@ kotlin { commonMain { dependencies { implementation(projects.core.designsystem) - implementation(projects.core.ui) + implementation(projects.core.droidkaigiui) implementation(projects.core.model) implementation(libs.kotlinSerializationJson) diff --git a/feature/settings/build.gradle.kts b/feature/settings/build.gradle.kts index a0abade1b..0665841c3 100644 --- a/feature/settings/build.gradle.kts +++ b/feature/settings/build.gradle.kts @@ -9,7 +9,7 @@ kotlin { commonMain { dependencies { implementation(projects.core.model) - implementation(projects.core.ui) + implementation(projects.core.droidkaigiui) implementation(projects.core.designsystem) implementation(libs.kotlinxCoroutinesCore) diff --git a/feature/sponsors/build.gradle.kts b/feature/sponsors/build.gradle.kts index 001dfa3cf..1f9ff0ee9 100644 --- a/feature/sponsors/build.gradle.kts +++ b/feature/sponsors/build.gradle.kts @@ -9,7 +9,7 @@ kotlin { commonMain { dependencies { implementation(projects.core.model) - implementation(projects.core.ui) + implementation(projects.core.droidkaigiui) implementation(libs.kotlinxCoroutinesCore) implementation(projects.core.designsystem) implementation(libs.moleculeRuntime) diff --git a/feature/staff/build.gradle.kts b/feature/staff/build.gradle.kts index 6d20b6a03..3304dea31 100644 --- a/feature/staff/build.gradle.kts +++ b/feature/staff/build.gradle.kts @@ -9,7 +9,7 @@ kotlin { commonMain { dependencies { implementation(projects.core.model) - implementation(projects.core.ui) + implementation(projects.core.droidkaigiui) implementation(libs.kotlinxCoroutinesCore) implementation(projects.core.designsystem) implementation(libs.moleculeRuntime) diff --git a/settings.gradle.kts b/settings.gradle.kts index 1a97fa099..b2d914368 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -35,7 +35,7 @@ include( ":core:designsystem", ":core:data", ":core:model", - ":core:ui", + ":core:droidkaigiui", ":core:testing", ":core:testing-manifest", ":core:common",