🔧 Modifier issues on the iosMain side of the code have been addressed.

DroidKaigi#485 (comment)
Corvus400 · Aug 22, 2024 · f77487e · f77487e
1 parent a82966a
commit f77487e
Show file tree

Hide file tree

Showing 69 changed files with 38 additions and 36 deletions.
diff --git 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
@@ -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 → core/droidkaigiui/.gitignore b/core/ui/.gitignore → core/droidkaigiui/.gitignore
diff --git a/core/ui/build.gradle.kts → core/droidkaigiui/build.gradle.kts b/core/ui/build.gradle.kts → 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 → core/droidkaigiui/proguard-rules.pro b/core/ui/proguard-rules.pro → core/droidkaigiui/proguard-rules.pro
diff --git a/...onfsched/ui/CanShowLargeVector.android.kt → ...onfsched/ui/CanShowLargeVector.android.kt b/...onfsched/ui/CanShowLargeVector.android.kt → ...onfsched/ui/CanShowLargeVector.android.kt
diff --git a/...onfsched/ui/ErrorAndRetryActionHandler.kt → ...onfsched/ui/ErrorAndRetryActionHandler.kt b/...onfsched/ui/ErrorAndRetryActionHandler.kt → ...onfsched/ui/ErrorAndRetryActionHandler.kt
diff --git a/.../confsched/ui/MessageStateHolderModule.kt → .../confsched/ui/MessageStateHolderModule.kt b/.../confsched/ui/MessageStateHolderModule.kt → .../confsched/ui/MessageStateHolderModule.kt
diff --git a/...d/ui/ProvideAboutHeaderPainter.android.kt → ...d/ui/ProvideAboutHeaderPainter.android.kt b/...d/ui/ProvideAboutHeaderPainter.android.kt → ...d/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/...dkaigi/confsched/ui/RandomUUID.android.kt → ...dkaigi/confsched/ui/RandomUUID.android.kt b/...dkaigi/confsched/ui/RandomUUID.android.kt → ...dkaigi/confsched/ui/RandomUUID.android.kt
diff --git a/...dkaigi/confsched/ui/ScreenInfo.android.kt → ...dkaigi/confsched/ui/ScreenInfo.android.kt b/...dkaigi/confsched/ui/ScreenInfo.android.kt → ...dkaigi/confsched/ui/ScreenInfo.android.kt
diff --git a/...i/confsched/ui/TestEnvironment.android.kt → ...i/confsched/ui/TestEnvironment.android.kt b/...i/confsched/ui/TestEnvironment.android.kt → ...i/confsched/ui/TestEnvironment.android.kt
diff --git a/...idMain/res/drawable/anim_header_title.xml → ...idMain/res/drawable/anim_header_title.xml b/...idMain/res/drawable/anim_header_title.xml → ...idMain/res/drawable/anim_header_title.xml
diff --git a/...Resources/drawable/about_header_title.xml → ...Resources/drawable/about_header_title.xml b/...Resources/drawable/about_header_title.xml → ...Resources/drawable/about_header_title.xml
diff --git a/...eResources/drawable/about_header_year.xml → ...eResources/drawable/about_header_year.xml b/...eResources/drawable/about_header_year.xml → ...eResources/drawable/about_header_year.xml
diff --git a/...in/composeResources/values-ja/strings.xml → ...in/composeResources/values-ja/strings.xml b/...in/composeResources/values-ja/strings.xml → ...in/composeResources/values-ja/strings.xml
diff --git a/...nMain/composeResources/values/strings.xml → ...nMain/composeResources/values/strings.xml b/...nMain/composeResources/values/strings.xml → ...nMain/composeResources/values/strings.xml
diff --git a/...droidkaigi/confsched/ui/AppErrorMapper.kt → ...droidkaigi/confsched/ui/AppErrorMapper.kt b/...droidkaigi/confsched/ui/AppErrorMapper.kt → ...droidkaigi/confsched/ui/AppErrorMapper.kt
diff --git a/...dkaigi/confsched/ui/CanShowLargeVector.kt → ...dkaigi/confsched/ui/CanShowLargeVector.kt b/...dkaigi/confsched/ui/CanShowLargeVector.kt → ...dkaigi/confsched/ui/CanShowLargeVector.kt
diff --git a/...nfsched/ui/ComposeResourceErrorMessage.kt → ...nfsched/ui/ComposeResourceErrorMessage.kt b/...nfsched/ui/ComposeResourceErrorMessage.kt → ...nfsched/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<ComposeResourceErrorMessage> = listOf(
     ComposeResourceErrorMessage(
         InternetConnectionException::class,
-        stringResource(UiRes.string.connection_failed),
+        stringResource(DroidKaigiUiRes.string.connection_failed),
     ),
 )
 

diff --git a/...o/github/droidkaigi/confsched/ui/UiRes.kt → ...roidkaigi/confsched/ui/DroidKaigiUiRes.kt b/...o/github/droidkaigi/confsched/ui/UiRes.kt → ...roidkaigi/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/...aigi/confsched/ui/ErrorAndRetryHandler.kt → ...aigi/confsched/ui/ErrorAndRetryHandler.kt b/...aigi/confsched/ui/ErrorAndRetryHandler.kt → ...aigi/confsched/ui/ErrorAndRetryHandler.kt
diff --git a/...b/droidkaigi/confsched/ui/ImagePainter.kt → ...b/droidkaigi/confsched/ui/ImagePainter.kt b/...b/droidkaigi/confsched/ui/ImagePainter.kt → ...b/droidkaigi/confsched/ui/ImagePainter.kt
diff --git a/...ub/droidkaigi/confsched/ui/ModifierExt.kt → ...ub/droidkaigi/confsched/ui/ModifierExt.kt b/...ub/droidkaigi/confsched/ui/ModifierExt.kt → ...ub/droidkaigi/confsched/ui/ModifierExt.kt
diff --git a/...gi/confsched/ui/NavHostWithSharedAxisX.kt → ...gi/confsched/ui/NavHostWithSharedAxisX.kt b/...gi/confsched/ui/NavHostWithSharedAxisX.kt → ...gi/confsched/ui/NavHostWithSharedAxisX.kt
diff --git a/...droidkaigi/confsched/ui/OnClickHandler.kt → ...droidkaigi/confsched/ui/OnClickHandler.kt b/...droidkaigi/confsched/ui/OnClickHandler.kt → ...droidkaigi/confsched/ui/OnClickHandler.kt
diff --git a/...oidkaigi/confsched/ui/PaddingValuesExt.kt → ...oidkaigi/confsched/ui/PaddingValuesExt.kt b/...oidkaigi/confsched/ui/PaddingValuesExt.kt → ...oidkaigi/confsched/ui/PaddingValuesExt.kt
diff --git a/...confsched/ui/PresenterDefaultsProvider.kt → ...confsched/ui/PresenterDefaultsProvider.kt b/...confsched/ui/PresenterDefaultsProvider.kt → ...confsched/ui/PresenterDefaultsProvider.kt
diff --git a/...oidkaigi/confsched/ui/PreviewOverrider.kt → ...oidkaigi/confsched/ui/PreviewOverrider.kt b/...oidkaigi/confsched/ui/PreviewOverrider.kt → ...oidkaigi/confsched/ui/PreviewOverrider.kt
diff --git a/...confsched/ui/ProvideAboutHeaderPainter.kt → ...confsched/ui/ProvideAboutHeaderPainter.kt b/...confsched/ui/ProvideAboutHeaderPainter.kt → ...confsched/ui/ProvideAboutHeaderPainter.kt
diff --git a/...hub/droidkaigi/confsched/ui/RandomUUID.kt → ...hub/droidkaigi/confsched/ui/RandomUUID.kt b/...hub/droidkaigi/confsched/ui/RandomUUID.kt → ...hub/droidkaigi/confsched/ui/RandomUUID.kt
diff --git a/...onfsched/ui/RememberNavigationArgument.kt → ...onfsched/ui/RememberNavigationArgument.kt b/...onfsched/ui/RememberNavigationArgument.kt → ...onfsched/ui/RememberNavigationArgument.kt
diff --git a/...ub/droidkaigi/confsched/ui/RoomIconExt.kt → ...ub/droidkaigi/confsched/ui/RoomIconExt.kt b/...ub/droidkaigi/confsched/ui/RoomIconExt.kt → ...ub/droidkaigi/confsched/ui/RoomIconExt.kt
diff --git a/...hub/droidkaigi/confsched/ui/ScreenInfo.kt → ...hub/droidkaigi/confsched/ui/ScreenInfo.kt b/...hub/droidkaigi/confsched/ui/ScreenInfo.kt → ...hub/droidkaigi/confsched/ui/ScreenInfo.kt
diff --git a/...roidkaigi/confsched/ui/TestEnvironment.kt → ...roidkaigi/confsched/ui/TestEnvironment.kt b/...roidkaigi/confsched/ui/TestEnvironment.kt → ...roidkaigi/confsched/ui/TestEnvironment.kt
diff --git a/...oidkaigi/confsched/ui/TimetableRoomExt.kt → ...oidkaigi/confsched/ui/TimetableRoomExt.kt b/...oidkaigi/confsched/ui/TimetableRoomExt.kt → ...oidkaigi/confsched/ui/TimetableRoomExt.kt
diff --git a/...droidkaigi/confsched/ui/UiStateBuilder.kt → ...droidkaigi/confsched/ui/UiStateBuilder.kt b/...droidkaigi/confsched/ui/UiStateBuilder.kt → ...droidkaigi/confsched/ui/UiStateBuilder.kt
diff --git a/...ub/droidkaigi/confsched/ui/UserMessage.kt → ...ub/droidkaigi/confsched/ui/UserMessage.kt b/...ub/droidkaigi/confsched/ui/UserMessage.kt → ...ub/droidkaigi/confsched/ui/UserMessage.kt
diff --git a/...nfsched/ui/animation/FavoriteAnimation.kt → ...nfsched/ui/animation/FavoriteAnimation.kt b/...nfsched/ui/animation/FavoriteAnimation.kt → ...nfsched/ui/animation/FavoriteAnimation.kt
diff --git a/...ui/animation/FavoriteAnimationModifier.kt → ...ui/animation/FavoriteAnimationModifier.kt b/...ui/animation/FavoriteAnimationModifier.kt → ...ui/animation/FavoriteAnimationModifier.kt
diff --git a/...ed/ui/animation/FavoriteAnimationScope.kt → ...ed/ui/animation/FavoriteAnimationScope.kt b/...ed/ui/animation/FavoriteAnimationScope.kt → ...ed/ui/animation/FavoriteAnimationScope.kt
diff --git a/...ed/ui/component/AnimatedLargeTopAppBar.kt → ...ed/ui/component/AnimatedLargeTopAppBar.kt b/...ed/ui/component/AnimatedLargeTopAppBar.kt → ...ed/ui/component/AnimatedLargeTopAppBar.kt
diff --git a/...hed/ui/component/AnimatedTextTopAppBar.kt → ...hed/ui/component/AnimatedTextTopAppBar.kt b/...hed/ui/component/AnimatedTextTopAppBar.kt → ...hed/ui/component/AnimatedTextTopAppBar.kt
diff --git a/...nfsched/ui/component/TimetableItemCard.kt → ...nfsched/ui/component/TimetableItemCard.kt b/...nfsched/ui/component/TimetableItemCard.kt → ...nfsched/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,15 +208,15 @@ 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),
             )
         } else {
             Icon(
                 Outlined.FavoriteBorder,
-                contentDescription = stringResource(UiRes.string.not_bookmarked),
+                contentDescription = stringResource(DroidKaigiUiRes.string.not_bookmarked),
                 tint = MaterialTheme.colorScheme.onSurfaceVariant,
             )
         }

diff --git a/...onfsched/ui/component/TimetableItemTag.kt → ...onfsched/ui/component/TimetableItemTag.kt b/...onfsched/ui/component/TimetableItemTag.kt → ...onfsched/ui/component/TimetableItemTag.kt
diff --git a/...i/confsched/ui/component/TimetableTime.kt → ...i/confsched/ui/component/TimetableTime.kt b/...i/confsched/ui/component/TimetableTime.kt → ...i/confsched/ui/component/TimetableTime.kt
diff --git a/...tionlocal/LocalAnimatedVisibilityScope.kt → ...tionlocal/LocalAnimatedVisibilityScope.kt b/...tionlocal/LocalAnimatedVisibilityScope.kt → ...tionlocal/LocalAnimatedVisibilityScope.kt
diff --git a/...nfsched/ui/compositionlocal/LocalClock.kt → ...nfsched/ui/compositionlocal/LocalClock.kt b/...nfsched/ui/compositionlocal/LocalClock.kt → ...nfsched/ui/compositionlocal/LocalClock.kt
diff --git a/...sitionlocal/LocalSharedTransitionScope.kt → ...sitionlocal/LocalSharedTransitionScope.kt b/...sitionlocal/LocalSharedTransitionScope.kt → ...sitionlocal/LocalSharedTransitionScope.kt
diff --git a/...gi/confsched/ui/CanShowLargeVector.ios.kt → ...gi/confsched/ui/CanShowLargeVector.ios.kt b/...gi/confsched/ui/CanShowLargeVector.ios.kt → ...gi/confsched/ui/CanShowLargeVector.ios.kt
diff --git a/...idkaigi/confsched/ui/IosComposeAdapter.kt → ...idkaigi/confsched/ui/IosComposeAdapter.kt b/...idkaigi/confsched/ui/IosComposeAdapter.kt → ...idkaigi/confsched/ui/IosComposeAdapter.kt
diff --git a/...sched/ui/ProvideAboutHeaderPainter.ios.kt → ...sched/ui/ProvideAboutHeaderPainter.ios.kt b/...sched/ui/ProvideAboutHeaderPainter.ios.kt → ...sched/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/...droidkaigi/confsched/ui/RandomUUID.ios.kt → ...droidkaigi/confsched/ui/RandomUUID.ios.kt b/...droidkaigi/confsched/ui/RandomUUID.ios.kt → ...droidkaigi/confsched/ui/RandomUUID.ios.kt
diff --git a/...droidkaigi/confsched/ui/ScreenInfo.ios.kt → ...droidkaigi/confsched/ui/ScreenInfo.ios.kt b/...droidkaigi/confsched/ui/ScreenInfo.ios.kt → ...droidkaigi/confsched/ui/ScreenInfo.ios.kt
diff --git a/...kaigi/confsched/ui/TestEnvironment.ios.kt → ...kaigi/confsched/ui/TestEnvironment.ios.kt b/...kaigi/confsched/ui/TestEnvironment.ios.kt → ...kaigi/confsched/ui/TestEnvironment.ios.kt
diff --git 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
@@ -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
@@ -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/...c/commonMain/kotlin/io/github/droidkaigi/confsched/about/section/AboutDroidKaigiDetail.kt b/...c/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -35,7 +35,7 @@ include(
     ":core:designsystem",
     ":core:data",
     ":core:model",
-    ":core:ui",
+    ":core:droidkaigiui",
     ":core:testing",
     ":core:testing-manifest",
     ":core:common",