Skip to content

Commit

Permalink
Merge pull request #234 from SWM-KAWAI-MANS/refactor/detail
Browse files Browse the repository at this point in the history
refactor : 프로젝트 내 불필요한 코드 및 일부 사항 리팩토링
  • Loading branch information
nohjunh authored Oct 19, 2023
2 parents d1f3fb8 + 41f7577 commit 1375403
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 20 deletions.
15 changes: 2 additions & 13 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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()
Expand Down Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion core/common/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import java.io.File
import java.io.FileInputStream
import java.util.*
import java.util.Properties

plugins {
id("nohjunh.android.library")
Expand Down
4 changes: 0 additions & 4 deletions core/data/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
)
}
}
}
}
}
1 change: 1 addition & 0 deletions core/ui/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<string name="arrow_forward_desc">앞으로 가기</string>

<string name="google_signin_btn">구글 로그인</string>
<string name="confirm_btn">확인</string>

<string name="settings">설정</string>
</resources>

0 comments on commit 1375403

Please sign in to comment.