From 3d46e51aa7ef6054d16468a475e1059cb932e056 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Tue, 9 Jul 2024 23:05:52 +0900 Subject: [PATCH] [FIX/#16] solving conflict --- core/build.gradle.kts | 4 ---- feature/build.gradle.kts | 3 --- feature/src/main/AndroidManifest.xml | 1 + .../terning/feature/calendar/component/WeekDaysHeader.kt | 6 ++++-- gradle/libs.versions.toml | 6 +----- 5 files changed, 6 insertions(+), 14 deletions(-) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 01463c713..c53a6a378 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -60,10 +60,6 @@ dependencies { // Compose Preview debugImplementation(libs.compose.ui.tooling) - //Compose Preview - implementation(libs.androidx.compose.ui.tooling) - implementation(libs.androidx.compose.ui.tooling.preview) - // Test Dependency testImplementation(libs.junit) androidTestImplementation(libs.androidx.junit) diff --git a/feature/build.gradle.kts b/feature/build.gradle.kts index 20541288a..16da9b5ee 100644 --- a/feature/build.gradle.kts +++ b/feature/build.gradle.kts @@ -92,9 +92,6 @@ dependencies { // Compose Preview debugImplementation(libs.compose.ui.tooling) -// //Compose Preview -// implementation(libs.androidx.compose.ui.tooling) -// implementation(libs.androidx.compose.ui.tooling.preview) // KakaoDependencies implementation(libs.kakao.user) diff --git a/feature/src/main/AndroidManifest.xml b/feature/src/main/AndroidManifest.xml index 1e31d319a..f136894fe 100644 --- a/feature/src/main/AndroidManifest.xml +++ b/feature/src/main/AndroidManifest.xml @@ -7,6 +7,7 @@ android:exported="true" android:label="@string/app_name" android:screenOrientation="portrait" + android:windowSoftInputMode="adjustResize" android:theme="@style/Theme.TerningAndroid"> diff --git a/feature/src/main/java/com/terning/feature/calendar/component/WeekDaysHeader.kt b/feature/src/main/java/com/terning/feature/calendar/component/WeekDaysHeader.kt index d4983af70..098459ce0 100644 --- a/feature/src/main/java/com/terning/feature/calendar/component/WeekDaysHeader.kt +++ b/feature/src/main/java/com/terning/feature/calendar/component/WeekDaysHeader.kt @@ -14,6 +14,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.terning.core.designsystem.theme.Black import com.terning.core.designsystem.theme.SundayRed +import com.terning.core.designsystem.theme.TerningPointTheme import com.terning.core.designsystem.theme.TerningTheme import com.terning.feature.R @@ -27,7 +28,8 @@ fun WeekDaysHeader( .background(Color.White) .padding( horizontal = 20.dp, - vertical = 18.dp), + vertical = 18.dp + ), ){ val dayOfWeek = listOf( R.string.calendar_text_sunday, @@ -52,7 +54,7 @@ fun WeekDaysHeader( @Preview(showBackground = true) @Composable fun WeekDaysHeaderPreview() { - TerningTheme{ + TerningPointTheme{ WeekDaysHeader() } } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 623eb7a00..dfe3113c2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -97,8 +97,6 @@ androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", versi androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "androidxComposeMaterial3" } androidx-compose-ui = { group = "androidx.compose.ui", name = "ui" } androidx-compose-ui-test = { group = "androidx.compose.ui", name = "ui-test-junit4" } -androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "uiTooling" } -androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "uiTooling" } androidx-compose-ui-testManifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } androidx-compose-navigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "composeNavigation" } androidx-compose-navigation-test = { group = "androidx.navigation", name = "navigation-testing", version.ref = "composeNavigation" } @@ -119,6 +117,7 @@ android-desugarJdkLibs = { group = "com.android.tools", name = "desugar_jdk_libs androidx-lifecycle-runtimeCompose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "androidxLifecycle" } androidx-lifecycle-viewModelCompose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "androidxLifecycle" } androidx-datastore = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "androidxDatastore" } +compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "uiTooling" } hilt-core = { group = "com.google.dagger", name = "hilt-core", version.ref = "hilt" } hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "hilt" } @@ -157,9 +156,6 @@ lottie = {group = "com.airbnb.android", name = "lottie", version.ref = "lottieVe kakao-user = {group = "com.kakao.sdk", name = "v2-user", version.ref = "kakaoVersion"} -compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "uiTooling" } - - [plugins] android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }