diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2a5e4554..1b20a575 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -130,7 +130,6 @@ dependencies { implementation(retrofit) implementation(retrofitJsonConverter) implementation(timber) - implementation(amplitude) } KakaoDependencies.run { diff --git a/app/src/main/java/co/orange/ddanzi/MyApp.kt b/app/src/main/java/co/orange/ddanzi/MyApp.kt index c548c533..ea027f8a 100644 --- a/app/src/main/java/co/orange/ddanzi/MyApp.kt +++ b/app/src/main/java/co/orange/ddanzi/MyApp.kt @@ -2,9 +2,9 @@ package co.orange.ddanzi import android.app.Application import androidx.appcompat.app.AppCompatDelegate +import co.orange.core.amplitude.AmplitudeManager import co.orange.ddanzi.BuildConfig.AMPLITUDE_KEY import co.orange.ddanzi.BuildConfig.NATIVE_APP_KEY -import co.orange.ddanzi.manager.AmplitudeManager import com.kakao.sdk.common.KakaoSdk import dagger.hilt.android.HiltAndroidApp import timber.log.Timber diff --git a/app/src/main/java/co/orange/ddanzi/di/module/NavigationModule.kt b/app/src/main/java/co/orange/ddanzi/di/module/NavigationModule.kt index 6a356cab..9a5091ba 100644 --- a/app/src/main/java/co/orange/ddanzi/di/module/NavigationModule.kt +++ b/app/src/main/java/co/orange/ddanzi/di/module/NavigationModule.kt @@ -1,7 +1,7 @@ package co.orange.ddanzi.di.module import co.orange.core.navigation.NavigationManager -import co.orange.ddanzi.navigate.NavigationManagerImpl +import co.orange.ddanzi.navigation.NavigationManagerImpl import dagger.Module import dagger.Provides import dagger.hilt.InstallIn diff --git a/app/src/main/java/co/orange/ddanzi/navigate/NavigationManagerImpl.kt b/app/src/main/java/co/orange/ddanzi/navigation/NavigationManagerImpl.kt similarity index 99% rename from app/src/main/java/co/orange/ddanzi/navigate/NavigationManagerImpl.kt rename to app/src/main/java/co/orange/ddanzi/navigation/NavigationManagerImpl.kt index e7eaa130..1e5b9722 100644 --- a/app/src/main/java/co/orange/ddanzi/navigate/NavigationManagerImpl.kt +++ b/app/src/main/java/co/orange/ddanzi/navigation/NavigationManagerImpl.kt @@ -1,4 +1,4 @@ -package co.orange.ddanzi.navigate +package co.orange.ddanzi.navigation import android.content.Context import android.content.Intent diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 916bf83b..fac0d748 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -30,21 +30,31 @@ android { } dependencies { - // Kotlin - implementation(KotlinDependencies.kotlin) + KotlinDependencies.run { + implementation(kotlin) + } - // Lifecycle Ktx - implementation(AndroidXDependencies.lifeCycleKtx) + AndroidXDependencies.run { + implementation(lifeCycleKtx) + implementation(hilt) + } - // Material Design - implementation(GoogleDependencies.materialDesign) + GoogleDependencies.run { + implementation(materialDesign) + } - // Hilt - implementation(AndroidXDependencies.hilt) - kapt(KaptDependencies.hiltAndroidCompiler) + KaptDependencies.run { + kapt(hiltAndroidCompiler) + } - // Test Dependency - testImplementation(TestDependencies.jUnit) - androidTestImplementation(TestDependencies.androidTest) - androidTestImplementation(TestDependencies.espresso) + ThirdPartyDependencies.run { + implementation(timber) + implementation(amplitude) + } + + TestDependencies.run { + testImplementation(jUnit) + androidTestImplementation(androidTest) + androidTestImplementation(espresso) + } } diff --git a/app/src/main/java/co/orange/ddanzi/manager/AmplitudeManager.kt b/core/src/main/java/co/orange/core/amplitude/AmplitudeManager.kt similarity index 97% rename from app/src/main/java/co/orange/ddanzi/manager/AmplitudeManager.kt rename to core/src/main/java/co/orange/core/amplitude/AmplitudeManager.kt index 97fb8ee5..feca8cda 100644 --- a/app/src/main/java/co/orange/ddanzi/manager/AmplitudeManager.kt +++ b/core/src/main/java/co/orange/core/amplitude/AmplitudeManager.kt @@ -1,4 +1,4 @@ -package co.orange.ddanzi.manager +package co.orange.core.amplitude import android.content.Context import com.amplitude.android.Amplitude diff --git a/feature/auth/src/main/java/co/orange/auth/login/LoginActivity.kt b/feature/auth/src/main/java/co/orange/auth/login/LoginActivity.kt index 860d3b71..4d345c35 100644 --- a/feature/auth/src/main/java/co/orange/auth/login/LoginActivity.kt +++ b/feature/auth/src/main/java/co/orange/auth/login/LoginActivity.kt @@ -8,6 +8,7 @@ import androidx.lifecycle.lifecycleScope import co.orange.auth.databinding.ActivityLoginBinding import co.orange.auth.phone.PhoneActivity import co.orange.core.R +import co.orange.core.amplitude.AmplitudeManager import co.orange.core.base.BaseActivity import co.orange.core.extension.setOnSingleClickListener import co.orange.core.extension.stringOf @@ -34,6 +35,7 @@ class LoginActivity : BaseActivity(featureR.layout.activit private fun initLoginBtnListener() { binding.btnLoginKakao.setOnSingleClickListener { + AmplitudeManager.trackEvent("click_sign_up_kakao") viewModel.startLogInWithKakao(this) } }