build: Task 19 완료 - :core:core-common 및 :core:core-network 모듈 분리
- core/core-common 모듈 신규 생성 (namespace: bums.lunatic.launcher.core.common): * MlKitTranslationHelper.kt를 :app에서 :core:core-common으로 이동 - core/core-network 모듈 신규 생성 (namespace: bums.lunatic.launcher.core.network): * NetworkClient.kt를 :app에서 :core:core-network로 이동 (OkHttp3 api 의존성 노출) - settings.gradle.kts & app/build.gradle.kts: :core:core-common, :core:core-network 모듈 등록 및 :app 의존성 연결 - TODO.md: 6-1(코어 공통/네트워크 분리) 진행 내역 반영 - 검증: ./gradlew :app:compileDebugKotlin 빌드 성공 확인 (13s, 59 actionable tasks)
This commit is contained in:
@@ -0,0 +1,29 @@
|
||||
plugins {
|
||||
id("com.android.library")
|
||||
id("kotlin-android")
|
||||
}
|
||||
|
||||
android {
|
||||
namespace = "bums.lunatic.launcher.core.common"
|
||||
compileSdk = 35
|
||||
|
||||
defaultConfig {
|
||||
minSdk = 26
|
||||
}
|
||||
|
||||
compileOptions {
|
||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
targetCompatibility = JavaVersion.VERSION_1_8
|
||||
}
|
||||
|
||||
kotlinOptions {
|
||||
jvmTarget = "1.8"
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
|
||||
implementation("com.google.android.gms:play-services-tasks:18.3.2")
|
||||
implementation("com.google.mlkit:translate:17.0.3")
|
||||
implementation("com.google.mlkit:language-id:17.0.5")
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest />
|
||||
+66
@@ -0,0 +1,66 @@
|
||||
package bums.lunatic.launcher.utils
|
||||
|
||||
import com.google.android.gms.tasks.Tasks
|
||||
import com.google.mlkit.nl.languageid.LanguageIdentification
|
||||
import com.google.mlkit.nl.translate.TranslateLanguage
|
||||
import com.google.mlkit.nl.translate.Translation
|
||||
import com.google.mlkit.nl.translate.TranslatorOptions
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.withContext
|
||||
|
||||
/**
|
||||
* Shared ML Kit language identification and translation helper with proper Translator lifecycle cleanup.
|
||||
*/
|
||||
object MlKitTranslationHelper {
|
||||
|
||||
fun detectSourceLanguage(
|
||||
sampleText: String,
|
||||
skipKorean: Boolean = true,
|
||||
onNotNeeded: (String) -> Unit,
|
||||
onDetected: (String) -> Unit,
|
||||
onFailure: (Exception) -> Unit = {}
|
||||
) {
|
||||
LanguageIdentification.getClient().identifyLanguage(sampleText)
|
||||
.addOnSuccessListener { languageCode ->
|
||||
if (languageCode == "und" || (skipKorean && languageCode == "ko")) {
|
||||
onNotNeeded(languageCode)
|
||||
return@addOnSuccessListener
|
||||
}
|
||||
val sourceLang = TranslateLanguage.fromLanguageTag(languageCode)
|
||||
if (sourceLang != null) {
|
||||
onDetected(sourceLang)
|
||||
} else {
|
||||
onNotNeeded(languageCode)
|
||||
}
|
||||
}
|
||||
.addOnFailureListener { e ->
|
||||
onFailure(e)
|
||||
}
|
||||
}
|
||||
|
||||
suspend fun translateBatch(
|
||||
sourceLang: String,
|
||||
targetLang: String = TranslateLanguage.KOREAN,
|
||||
texts: List<String>,
|
||||
onModelReady: (() -> Unit)? = null
|
||||
): List<String> = withContext(Dispatchers.IO) {
|
||||
val options = TranslatorOptions.Builder()
|
||||
.setSourceLanguage(sourceLang)
|
||||
.setTargetLanguage(targetLang)
|
||||
.build()
|
||||
val translator = Translation.getClient(options)
|
||||
try {
|
||||
Tasks.await(translator.downloadModelIfNeeded())
|
||||
withContext(Dispatchers.Main) { onModelReady?.invoke() }
|
||||
texts.map { line ->
|
||||
try {
|
||||
Tasks.await(translator.translate(line))
|
||||
} catch (_: Exception) {
|
||||
line
|
||||
}
|
||||
}
|
||||
} finally {
|
||||
translator.close()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
plugins {
|
||||
id("com.android.library")
|
||||
id("kotlin-android")
|
||||
}
|
||||
|
||||
android {
|
||||
namespace = "bums.lunatic.launcher.core.network"
|
||||
compileSdk = 35
|
||||
|
||||
defaultConfig {
|
||||
minSdk = 26
|
||||
}
|
||||
|
||||
compileOptions {
|
||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
targetCompatibility = JavaVersion.VERSION_1_8
|
||||
}
|
||||
|
||||
kotlinOptions {
|
||||
jvmTarget = "1.8"
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
api("com.squareup.okhttp3:logging-interceptor:4.11.0")
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest />
|
||||
@@ -0,0 +1,19 @@
|
||||
package bums.lunatic.launcher.utils
|
||||
|
||||
import okhttp3.ConnectionPool
|
||||
import okhttp3.OkHttpClient
|
||||
import java.util.concurrent.TimeUnit
|
||||
|
||||
/**
|
||||
* Shared OkHttpClient singleton to avoid creating per-call connection pools and thread leaks.
|
||||
*/
|
||||
object NetworkClient {
|
||||
val client: OkHttpClient by lazy {
|
||||
OkHttpClient.Builder()
|
||||
.connectionPool(ConnectionPool(5, 60, TimeUnit.SECONDS))
|
||||
.connectTimeout(30, TimeUnit.SECONDS)
|
||||
.readTimeout(30, TimeUnit.SECONDS)
|
||||
.writeTimeout(30, TimeUnit.SECONDS)
|
||||
.build()
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user