From f91319c2fc75da524c14106cbfbce25f57616363 Mon Sep 17 00:00:00 2001 From: Junhyeok Date: Thu, 19 Oct 2023 14:57:51 +0900 Subject: [PATCH 1/4] =?UTF-8?q?refactor=20:=20core:common=20import=20*=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0=20=EB=B0=8F=20=EB=AA=85=EC=8B=9C=EC=A0=81=20?= =?UTF-8?q?=EC=84=A0=EC=96=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/common/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts index 8af60d94..dd377f95 100644 --- a/core/common/build.gradle.kts +++ b/core/common/build.gradle.kts @@ -1,6 +1,6 @@ import java.io.File import java.io.FileInputStream -import java.util.* +import java.util.Properties plugins { id("nohjunh.android.library") From 765a3271665d8665b7002ade7dcd80845da35741 Mon Sep 17 00:00:00 2001 From: Junhyeok Date: Thu, 19 Oct 2023 15:01:29 +0900 Subject: [PATCH 2/4] =?UTF-8?q?refactor=20:=20core:data=20=EC=BB=A8?= =?UTF-8?q?=EB=B2=A4=EC=85=98=EC=97=90=20=EC=A0=95=EC=9D=98=EB=90=9C=20?= =?UTF-8?q?=EC=A4=91=EB=B3=B5=20Hilt=20=EC=9D=98=EC=A1=B4=EC=84=B1=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/data/build.gradle.kts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/core/data/build.gradle.kts b/core/data/build.gradle.kts index 6637983e..284640a1 100644 --- a/core/data/build.gradle.kts +++ b/core/data/build.gradle.kts @@ -26,10 +26,6 @@ dependencies { implementation(libs.kotlinx.coroutines.android) implementation(libs.kotlinx.serialization.json) - implementation(libs.hilt.android) - implementation(libs.androidx.hilt.navigation.compose) - kapt(libs.hilt.compiler) - implementation(libs.google.location) testImplementation(project(":core:testing")) From 0a1090fea8bd0d9c87107bc052e65c95c2de2b12 Mon Sep 17 00:00:00 2001 From: Junhyeok Date: Thu, 19 Oct 2023 15:01:58 +0900 Subject: [PATCH 3/4] =?UTF-8?q?refactor=20:=20SnackbarBox=20strings.xml?= =?UTF-8?q?=EB=A1=9C=20=EB=AC=B8=EC=9E=90=EC=97=B4=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyrun/partyrunapplication/core/ui/SnackbarBox.kt | 5 +++-- core/ui/src/main/res/values/strings.xml | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/ui/src/main/java/online/partyrun/partyrunapplication/core/ui/SnackbarBox.kt b/core/ui/src/main/java/online/partyrun/partyrunapplication/core/ui/SnackbarBox.kt index 8540aa3b..2c815f0f 100644 --- a/core/ui/src/main/java/online/partyrun/partyrunapplication/core/ui/SnackbarBox.kt +++ b/core/ui/src/main/java/online/partyrun/partyrunapplication/core/ui/SnackbarBox.kt @@ -18,6 +18,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip +import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp @Composable @@ -59,11 +60,11 @@ fun SnackbarBox( ) { Text( modifier = Modifier.clickable { dismiss() }, - text = "확인", + text = stringResource(id = R.string.confirm_btn), style = MaterialTheme.typography.titleMedium, color = MaterialTheme.colorScheme.onPrimaryContainer ) } } } -} \ No newline at end of file +} diff --git a/core/ui/src/main/res/values/strings.xml b/core/ui/src/main/res/values/strings.xml index ca29b0a2..33c57112 100644 --- a/core/ui/src/main/res/values/strings.xml +++ b/core/ui/src/main/res/values/strings.xml @@ -6,6 +6,7 @@ 앞으로 가기 구글 로그인 + 확인 설정 From 41f757740ccb3e67f02d9ff472ba353424634b34 Mon Sep 17 00:00:00 2001 From: Junhyeok Date: Thu, 19 Oct 2023 15:12:24 +0900 Subject: [PATCH 4/4] =?UTF-8?q?refactor=20:=20App=20Module=20import=20*=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EC=BB=A8=EB=B2=A4=EC=85=98=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9=20=ED=9B=84=20=EC=A4=91=EB=B3=B5=20=EC=84=A0?= =?UTF-8?q?=EC=96=B8=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 63a038c8..35d63b94 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,13 +1,13 @@ import java.io.File import java.io.FileInputStream -import java.util.* +import java.util.Properties plugins { id("nohjunh.android.application") id("nohjunh.android.application.compose") + id("nohjunh.android.hilt") id("com.google.gms.google-services") id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin") - id("nohjunh.android.hilt") } val keystoreProperties = Properties() @@ -79,21 +79,10 @@ android { ) } } - - compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 - } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } buildFeatures { compose = true buildConfig = true } - composeOptions { - kotlinCompilerExtensionVersion = Configurations.COMPOSE - } kapt { correctErrorTypes = true }