From 5ea55e4eeabbdd6fb112a91cf5861c1cacbbcc84 Mon Sep 17 00:00:00 2001 From: flash159483 Date: Fri, 19 Jul 2024 21:24:03 +0900 Subject: [PATCH] =?UTF-8?q?[FEAT]#30:=20package=20=EC=9D=B4=EB=A6=84=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 1 + .../kotlin/com/bff/wespot/NavigatorImpl.kt | 4 ++-- .../com/bff/wespot/di/NavigationModule.kt | 2 +- .../navigation/ExampleInstrumentedTest.kt | 24 ------------------- .../navigation/Navigator.kt | 2 +- .../navigation/util/Extension.kt | 2 +- .../danggeun/navigation/ExampleUnitTest.kt | 17 ------------- .../com/bff/wespot/auth/AuthActivity.kt | 6 ++--- 8 files changed, 9 insertions(+), 49 deletions(-) delete mode 100644 core/navigation/src/androidTest/java/com/danggeun/navigation/ExampleInstrumentedTest.kt rename core/navigation/src/main/java/com/{danggeun => wespot}/navigation/Navigator.kt (82%) rename core/navigation/src/main/java/com/{danggeun => wespot}/navigation/util/Extension.kt (92%) delete mode 100644 core/navigation/src/test/java/com/danggeun/navigation/ExampleUnitTest.kt diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f7b16cf5..dbefa68f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -33,6 +33,7 @@ dependencies { implementation(project(":core:ui")) implementation(project(":core:common")) implementation(project(":feature:auth")) + implementation(project(":core:network")) implementation(project(":core:navigation")) implementation(libs.kakao.sdk) diff --git a/app/src/main/kotlin/com/bff/wespot/NavigatorImpl.kt b/app/src/main/kotlin/com/bff/wespot/NavigatorImpl.kt index 124b98d3..f7b3239d 100644 --- a/app/src/main/kotlin/com/bff/wespot/NavigatorImpl.kt +++ b/app/src/main/kotlin/com/bff/wespot/NavigatorImpl.kt @@ -2,8 +2,8 @@ package com.bff.wespot import android.content.Context import android.content.Intent -import com.danggeun.navigation.Navigator -import com.danggeun.navigation.util.buildIntent +import com.wespot.navigation.Navigator +import com.wespot.navigation.util.buildIntent import javax.inject.Inject class NavigatorImpl @Inject constructor() : Navigator { diff --git a/app/src/main/kotlin/com/bff/wespot/di/NavigationModule.kt b/app/src/main/kotlin/com/bff/wespot/di/NavigationModule.kt index 54827ef2..1b36270b 100644 --- a/app/src/main/kotlin/com/bff/wespot/di/NavigationModule.kt +++ b/app/src/main/kotlin/com/bff/wespot/di/NavigationModule.kt @@ -1,7 +1,7 @@ package com.bff.wespot.di import com.bff.wespot.NavigatorImpl -import com.danggeun.navigation.Navigator +import com.wespot.navigation.Navigator import dagger.Binds import dagger.Module import dagger.hilt.InstallIn diff --git a/core/navigation/src/androidTest/java/com/danggeun/navigation/ExampleInstrumentedTest.kt b/core/navigation/src/androidTest/java/com/danggeun/navigation/ExampleInstrumentedTest.kt deleted file mode 100644 index dcd2d135..00000000 --- a/core/navigation/src/androidTest/java/com/danggeun/navigation/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.danggeun.navigation - -import androidx.test.platform.app.InstrumentationRegistry -import androidx.test.ext.junit.runners.AndroidJUnit4 - -import org.junit.Test -import org.junit.runner.RunWith - -import org.junit.Assert.* - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.danggeun.navigation.test", appContext.packageName) - } -} \ No newline at end of file diff --git a/core/navigation/src/main/java/com/danggeun/navigation/Navigator.kt b/core/navigation/src/main/java/com/wespot/navigation/Navigator.kt similarity index 82% rename from core/navigation/src/main/java/com/danggeun/navigation/Navigator.kt rename to core/navigation/src/main/java/com/wespot/navigation/Navigator.kt index 21754b04..2543d529 100644 --- a/core/navigation/src/main/java/com/danggeun/navigation/Navigator.kt +++ b/core/navigation/src/main/java/com/wespot/navigation/Navigator.kt @@ -1,4 +1,4 @@ -package com.danggeun.navigation +package com.wespot.navigation import android.content.Context import android.content.Intent diff --git a/core/navigation/src/main/java/com/danggeun/navigation/util/Extension.kt b/core/navigation/src/main/java/com/wespot/navigation/util/Extension.kt similarity index 92% rename from core/navigation/src/main/java/com/danggeun/navigation/util/Extension.kt rename to core/navigation/src/main/java/com/wespot/navigation/util/Extension.kt index b5195326..dc2cd71d 100644 --- a/core/navigation/src/main/java/com/danggeun/navigation/util/Extension.kt +++ b/core/navigation/src/main/java/com/wespot/navigation/util/Extension.kt @@ -1,4 +1,4 @@ -package com.danggeun.navigation.util +package com.wespot.navigation.util import android.app.Activity import android.content.Context diff --git a/core/navigation/src/test/java/com/danggeun/navigation/ExampleUnitTest.kt b/core/navigation/src/test/java/com/danggeun/navigation/ExampleUnitTest.kt deleted file mode 100644 index 4958aff8..00000000 --- a/core/navigation/src/test/java/com/danggeun/navigation/ExampleUnitTest.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.danggeun.navigation - -import org.junit.Test - -import org.junit.Assert.* - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} \ No newline at end of file diff --git a/feature/auth/src/main/kotlin/com/bff/wespot/auth/AuthActivity.kt b/feature/auth/src/main/kotlin/com/bff/wespot/auth/AuthActivity.kt index 807d351e..b08a869e 100644 --- a/feature/auth/src/main/kotlin/com/bff/wespot/auth/AuthActivity.kt +++ b/feature/auth/src/main/kotlin/com/bff/wespot/auth/AuthActivity.kt @@ -28,11 +28,11 @@ import com.bff.wespot.auth.state.AuthSideEffect import com.bff.wespot.auth.viewmodel.AuthViewModel import com.bff.wespot.designsystem.theme.WeSpotTheme import com.bff.wespot.model.constants.LoginState -import com.danggeun.navigation.Navigator import com.ramcosta.composedestinations.DestinationsNavHost import com.ramcosta.composedestinations.navigation.dependency import com.ramcosta.composedestinations.navigation.navigate import com.ramcosta.composedestinations.rememberNavHostEngine +import com.wespot.navigation.Navigator import dagger.hilt.android.AndroidEntryPoint import org.orbitmvi.orbit.compose.collectAsState import org.orbitmvi.orbit.compose.collectSideEffect @@ -119,13 +119,13 @@ class AuthActivity : ComponentActivity() { } LaunchedEffect(key1 = Unit) { - action(AuthAction.autoLogin) + action(AuthAction.AutoLogin) } } } private fun login() { - viewModel.onAction(AuthAction.autoLogin) + viewModel.onAction(AuthAction.AutoLogin) viewModel.loginState.observe(this) { loginState = it }