From 4f7d02ecacfd3dd71b7ca236238ad234dc1a4ee2 Mon Sep 17 00:00:00 2001 From: JJAE WON <55980680+ashwon12@users.noreply.github.com> Date: Sat, 11 Jan 2025 02:48:39 +0900 Subject: [PATCH] =?UTF-8?q?feat/#7=20:=20namespace=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20=ED=8C=A8=ED=82=A4?= =?UTF-8?q?=EC=A7=80=20=EA=B2=BD=EB=A1=9C=20=EC=9D=BC=EC=B9=98=ED=95=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yapp/{ => core}/designsystem/theme/Color.kt | 2 +- .../yapp/{ => core}/designsystem/theme/Preview.kt | 12 +++++++++--- .../com/yapp/{ => core}/designsystem/theme/Theme.kt | 2 +- .../yapp/{ => core}/designsystem/theme/Typography.kt | 4 ++-- 4 files changed, 13 insertions(+), 7 deletions(-) rename core/designsystem/src/main/java/com/yapp/{ => core}/designsystem/theme/Color.kt (98%) rename core/designsystem/src/main/java/com/yapp/{ => core}/designsystem/theme/Preview.kt (93%) rename core/designsystem/src/main/java/com/yapp/{ => core}/designsystem/theme/Theme.kt (95%) rename core/designsystem/src/main/java/com/yapp/{ => core}/designsystem/theme/Typography.kt (98%) diff --git a/core/designsystem/src/main/java/com/yapp/designsystem/theme/Color.kt b/core/designsystem/src/main/java/com/yapp/core/designsystem/theme/Color.kt similarity index 98% rename from core/designsystem/src/main/java/com/yapp/designsystem/theme/Color.kt rename to core/designsystem/src/main/java/com/yapp/core/designsystem/theme/Color.kt index 8cfcbc9..0d236f1 100644 --- a/core/designsystem/src/main/java/com/yapp/designsystem/theme/Color.kt +++ b/core/designsystem/src/main/java/com/yapp/core/designsystem/theme/Color.kt @@ -1,4 +1,4 @@ -package com.yapp.designsystem.theme +package com.yapp.core.designsystem.theme import androidx.compose.runtime.Immutable import androidx.compose.runtime.staticCompositionLocalOf diff --git a/core/designsystem/src/main/java/com/yapp/designsystem/theme/Preview.kt b/core/designsystem/src/main/java/com/yapp/core/designsystem/theme/Preview.kt similarity index 93% rename from core/designsystem/src/main/java/com/yapp/designsystem/theme/Preview.kt rename to core/designsystem/src/main/java/com/yapp/core/designsystem/theme/Preview.kt index b912b36..c2d3089 100644 --- a/core/designsystem/src/main/java/com/yapp/designsystem/theme/Preview.kt +++ b/core/designsystem/src/main/java/com/yapp/core/designsystem/theme/Preview.kt @@ -1,8 +1,14 @@ -package com.yapp.designsystem.theme +package com.yapp.core.designsystem.theme import androidx.compose.foundation.background import androidx.compose.foundation.border -import androidx.compose.foundation.layout.* +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.grid.GridCells import androidx.compose.foundation.lazy.grid.LazyVerticalGrid import androidx.compose.foundation.lazy.grid.items @@ -13,9 +19,9 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import androidx.compose.ui.tooling.preview.Preview @Composable private fun ColorPreview(color: Color, name: String) { diff --git a/core/designsystem/src/main/java/com/yapp/designsystem/theme/Theme.kt b/core/designsystem/src/main/java/com/yapp/core/designsystem/theme/Theme.kt similarity index 95% rename from core/designsystem/src/main/java/com/yapp/designsystem/theme/Theme.kt rename to core/designsystem/src/main/java/com/yapp/core/designsystem/theme/Theme.kt index ad478da..02ada6f 100644 --- a/core/designsystem/src/main/java/com/yapp/designsystem/theme/Theme.kt +++ b/core/designsystem/src/main/java/com/yapp/core/designsystem/theme/Theme.kt @@ -1,4 +1,4 @@ -package com.yapp.designsystem.theme +package com.yapp.core.designsystem.theme import androidx.compose.material3.MaterialTheme import androidx.compose.material3.lightColorScheme diff --git a/core/designsystem/src/main/java/com/yapp/designsystem/theme/Typography.kt b/core/designsystem/src/main/java/com/yapp/core/designsystem/theme/Typography.kt similarity index 98% rename from core/designsystem/src/main/java/com/yapp/designsystem/theme/Typography.kt rename to core/designsystem/src/main/java/com/yapp/core/designsystem/theme/Typography.kt index 41ee870..fd1de7c 100644 --- a/core/designsystem/src/main/java/com/yapp/designsystem/theme/Typography.kt +++ b/core/designsystem/src/main/java/com/yapp/core/designsystem/theme/Typography.kt @@ -1,4 +1,4 @@ -package com.yapp.designsystem.theme +package com.yapp.core.designsystem.theme import androidx.compose.runtime.Immutable import androidx.compose.runtime.staticCompositionLocalOf @@ -11,7 +11,7 @@ import androidx.compose.ui.text.style.LineHeightStyle import androidx.compose.ui.unit.TextUnit import androidx.compose.ui.unit.TextUnitType import androidx.compose.ui.unit.sp -import com.yapp.designsystem.R +import com.yapp.core.designsystem.R internal val pretendardFamily = FontFamily( Font(R.font.pretendard, FontWeight(700)),