TOP-87 featurne core:navigation 모듈 구현

app/build.gradle.kts

@@ -53,6 +53,7 @@ android {
 }
 
 dependencies {
+    implementation(project(":core:navigation"))
     implementation(project(":core:ui"))
     implementation(project(":domain"))
     implementation(project(":data"))

app/src/main/java/com/tht/tht/HomeActivity.kt

@@ -12,6 +12,7 @@ import androidx.lifecycle.repeatOnLifecycle
 import com.tht.tht.databinding.ActivityHomeBinding
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
+import tht.core.navigation.ToHotNavigation
 import tht.core.ui.base.BaseActivity
 import tht.core.ui.base.FragmentNavigator
 import tht.core.ui.delegate.viewBinding
@@ -20,6 +21,7 @@ import tht.feature.chat.ChatFragment
 import tht.feature.heart.HeartFragment
 import tht.feature.setting.MyFragment
 import tht.feature.tohot.tohot.fragment.ToHotFragment
+import javax.inject.Inject
 
 @SuppressLint("CommitTransaction")
 @AndroidEntryPoint
@@ -28,6 +30,9 @@ class HomeActivity : BaseActivity<HomeViewModel, ActivityHomeBinding>(), Fragmen
     override val vm by viewModels<HomeViewModel>()
     override val binding by viewBinding(ActivityHomeBinding::inflate)
 
+    @Inject
+    lateinit var toHotNavigation: ToHotNavigation
+
     override fun initViews() {
         initNavigationBar()
     }
@@ -42,7 +47,10 @@ class HomeActivity : BaseActivity<HomeViewModel, ActivityHomeBinding>(), Fragmen
         binding.bnvHome.setOnItemSelectedListener { item ->
             when (item.itemId) {
                 R.id.menu_tohot -> {
-                    showFragment(ToHotFragment.TAG)
+                    toHotNavigation.navigateToHot(
+                        supportFragmentManager,
+                        R.id.fragment_container
+                    )
                     true
                 }
                 R.id.menu_heart -> {

app/src/main/java/com/tht/tht/SplashActivity.kt

@@ -3,17 +3,16 @@ package com.tht.tht
 import android.animation.Animator
 import android.annotation.SuppressLint
 import android.os.Bundle
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import com.tht.tht.databinding.ActivitySplashBinding
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
+import tht.core.navigation.SignupNavigation
 import tht.core.ui.delegate.viewBinding
-import tht.feature.signin.prelogin.PreloginActivity
+import javax.inject.Inject
 
 @SuppressLint("CustomSplashScreen")
 @AndroidEntryPoint
@@ -22,6 +21,12 @@ class SplashActivity : AppCompatActivity() {
     private val viewModel: SplashViewModel by viewModels()
     private val binding: ActivitySplashBinding by viewBinding(ActivitySplashBinding::inflate)
 
+    @Inject
+    lateinit var signupNavigation: SignupNavigation
+
+    @Inject
+    lateinit var homeNavigation: SignupNavigation
+
     override fun onCreate(savedInstanceState: Bundle?) {
         installSplashScreen()
         super.onCreate(savedInstanceState)
@@ -46,27 +51,16 @@ class SplashActivity : AppCompatActivity() {
     }
 
     private fun observeViewModel() {
-        val signupResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-            binding.lottieView.isVisible = false
-            when (it.resultCode) {
-                RESULT_OK -> viewModel.signupSuccessEvent()
-                else -> viewModel.signupCancelEvent()
-            }
-        }
-
         lifecycleScope.launch {
             viewModel.sideEffect.collect {
                 when (it) {
                     is SplashSideEffect.Signup -> {
-                        signupResult.launch(PreloginActivity.getIntent(this@SplashActivity))
-                    }
-
-                    is SplashSideEffect.Home -> {
-                        startActivity(HomeActivity.newIntent(this@SplashActivity))
+                        signupNavigation.navigatePreLogin(this@SplashActivity)
                         finish()
                     }
 
-                    is SplashSideEffect.Cancel -> {
+                    is SplashSideEffect.Home -> {
+                        homeNavigation.navigatePreLogin(this@SplashActivity)
                         finish()
                     }
                 }

app/src/main/java/com/tht/tht/SplashViewModel.kt

@@ -21,10 +21,6 @@ class SplashViewModel @Inject constructor(
         checkAutoLogin()
     }
 
-    fun signupSuccessEvent() {
-        checkAutoLogin()
-    }
-
     private fun checkAutoLogin() {
         viewModelScope.launch {
             fetchThtTokenUseCase()
@@ -36,16 +32,9 @@ class SplashViewModel @Inject constructor(
                 }
         }
     }
-
-    fun signupCancelEvent() {
-        viewModelScope.launch {
-            _sideEffect.emit(SplashSideEffect.Cancel)
-        }
-    }
 }
 
 sealed class SplashSideEffect {
     object Signup : SplashSideEffect()
     object Home : SplashSideEffect()
-    object Cancel : SplashSideEffect()
 }

app/src/main/java/com/tht/tht/navigation/HomeNavigationImpl.kt

@@ -0,0 +1,13 @@
+package com.tht.tht.navigation
+
+import android.content.Context
+import com.tht.tht.HomeActivity
+import tht.core.navigation.HomeNavigation
+import javax.inject.Inject
+
+class HomeNavigationImpl @Inject constructor() : HomeNavigation {
+
+    override fun navigateHome(context: Context) {
+        context.startActivity(HomeActivity.newIntent(context))
+    }
+}

app/src/main/java/com/tht/tht/navigation/NavigationModule.kt

@@ -0,0 +1,25 @@
+package com.tht.tht.navigation
+
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import tht.core.navigation.HomeNavigation
+import tht.core.navigation.SignupNavigation
+import tht.core.navigation.ToHotNavigation
+import tht.feature.signin.navigation.SignupNavigationImpl
+import tht.feature.tohot.navigation.ToHotNavigationImpl
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class NavigationModule {
+
+    @Binds
+    abstract fun bindHomeNavigation(impl: HomeNavigationImpl): HomeNavigation
+
+    @Binds
+    abstract fun bindSignupNavigation(impl: SignupNavigationImpl): SignupNavigation
+
+    @Binds
+    abstract fun bindToHotNavigation(impl: ToHotNavigationImpl): ToHotNavigation
+}

core/compose-ui/build.gradle.kts

@@ -5,10 +5,10 @@ plugins {
 
 android {
     namespace = "com.example.compose_ui"
-    compileSdk = 33
+    compileSdk = rootProject.ext.get("compileSdk") as Int
 
     defaultConfig {
-        minSdk = 24
+        minSdk = rootProject.ext.get("minSdkVersion") as Int
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")

core/navigation/.gitignore

@@ -0,0 +1 @@
+/build

core/navigation/build.gradle.kts

@@ -0,0 +1,39 @@
+plugins {
+    id("com.android.library")
+    id("org.jetbrains.kotlin.android")
+}
+
+android {
+    namespace = "tht.core.navigation"
+    compileSdk = rootProject.ext.get("compileSdk") as Int
+
+    defaultConfig {
+        minSdk = rootProject.ext.get("minSdkVersion") as Int
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+dependencies {
+    implementation("androidx.core:core-ktx:1.9.0")
+    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("com.google.android.material:material:1.8.0")
+    testImplementation("junit:junit:4.13.2")
+    androidTestImplementation("androidx.test.ext:junit:1.1.5")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+}

core/navigation/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

core/navigation/src/androidTest/java/tht/core/navigation/ExampleInstrumentedTest.kt

@@ -0,0 +1,24 @@
+package tht.core.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("tht.core.navigation.test", appContext.packageName)
+    }
+}

core/navigation/src/main/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>

core/navigation/src/main/java/tht/core/navigation/HomeNavigation.kt

@@ -0,0 +1,7 @@
+package tht.core.navigation
+
+import android.content.Context
+
+interface HomeNavigation {
+    fun navigateHome(context: Context)
+}

core/navigation/src/main/java/tht/core/navigation/SignupNavigation.kt

@@ -0,0 +1,7 @@
+package tht.core.navigation
+
+import android.content.Context
+
+interface SignupNavigation {
+    fun navigatePreLogin(context: Context)
+}

core/navigation/src/main/java/tht/core/navigation/ToHotNavigation.kt

@@ -0,0 +1,10 @@
+package tht.core.navigation
+
+import androidx.fragment.app.FragmentManager
+
+interface ToHotNavigation {
+    fun navigateToHot(
+        fragmentManager: FragmentManager,
+        fragmentContainerResourceId: Int
+    )
+}

core/navigation/src/test/java/tht/core/navigation/ExampleUnitTest.kt

@@ -0,0 +1,17 @@
+package tht.core.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)
+    }
+}

feature/chat/build.gradle.kts

@@ -45,6 +45,7 @@ android {
 }
 
 dependencies {
+    implementation(project(":core:navigation"))
     implementation(project(":core:ui"))
     implementation(project(":core:compose-ui"))
     implementation(project(":domain"))

feature/heart/build.gradle.kts

@@ -34,6 +34,7 @@ android {
 }
 
 dependencies {
+    implementation(project(":core:navigation"))
     implementation(project(":core:ui"))
     implementation(project(":domain"))
 

feature/setting/build.gradle.kts

@@ -34,6 +34,7 @@ android {
 }
 
 dependencies {
+    implementation(project(":core:navigation"))
     implementation(project(":core:ui"))
     implementation(project(":domain"))
 

feature/signin/build.gradle.kts

@@ -42,6 +42,7 @@ android {
 }
 
 dependencies {
+    implementation(project(":core:navigation"))
     implementation(project(":core:ui"))
     implementation(project(":domain"))
 

feature/signin/src/main/java/tht/feature/signin/navigation/SignupNavigationImpl.kt

@@ -0,0 +1,12 @@
+package tht.feature.signin.navigation
+
+import android.content.Context
+import tht.core.navigation.SignupNavigation
+import tht.feature.signin.prelogin.PreloginActivity
+import javax.inject.Inject
+
+class SignupNavigationImpl @Inject constructor() : SignupNavigation {
+    override fun navigatePreLogin(context: Context) {
+        context.startActivity(PreloginActivity.getIntent(context))
+    }
+}

feature/signin/src/main/java/tht/feature/signin/prelogin/PreloginActivity.kt

@@ -2,7 +2,6 @@ package tht.feature.signin.prelogin
 
 import android.content.Context
 import android.content.Intent
-import android.util.Log
 import androidx.activity.viewModels
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
@@ -30,13 +29,6 @@ class PreloginActivity : BaseStateActivity<PreloginViewModel, ActivityPreloginBi
 
     override val binding by viewBinding(ActivityPreloginBinding::inflate)
 
-    override fun onNewIntent(intent: Intent?) {
-        super.onNewIntent(intent)
-        Log.d("TAG", "onNewIntent PreLoginActivity")
-        setResult(RESULT_OK)
-        finish()
-    }
-
     override fun initViews() = with(binding) {
         btnKakaoLogin.setOnClickListener {
             vm.requestKakaoLogin()