Merge pull request #34 from YAPP-Github/feature/flash159483/#29

#29: AuthActivity를 만들어 회원가입을 진행해요

app/build.gradle.kts

@@ -33,6 +33,7 @@ dependencies {
     implementation(project(":core:ui"))
     implementation(project(":core:common"))
     implementation(project(":feature:auth"))
+    implementation(project(":core:navigation"))
 
     implementation(libs.kakao.sdk)
     implementation(libs.androidx.appcompat)

app/src/main/AndroidManifest.xml

@@ -3,7 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
-
     <application
         android:name=".application.WeSpotApplication"
         android:allowBackup="true"
@@ -14,8 +13,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.WeSpot">
+
         <activity
-            android:name=".MainActivity"
+            android:name=".auth.AuthActivity"
             android:exported="true"
             android:label="@string/app_name"
             android:theme="@style/Theme.WeSpot"
@@ -27,6 +27,11 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name=".MainActivity"
+            android:exported="false" />
+
+
         <activity
             android:name="com.kakao.sdk.auth.AuthCodeHandlerActivity"
             android:launchMode="singleTask"

app/src/main/kotlin/com/bff/wespot/MainActivity.kt

@@ -3,41 +3,12 @@ package com.bff.wespot
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.Surface
-import androidx.compose.ui.Modifier
-import androidx.lifecycle.viewmodel.compose.viewModel
-import androidx.navigation.compose.rememberNavController
-import com.bff.wespot.auth.screen.NavGraphs
-import com.bff.wespot.auth.viewmodel.AuthViewModel
-import com.bff.wespot.designsystem.theme.WeSpotTheme
-import com.ramcosta.composedestinations.DestinationsNavHost
-import com.ramcosta.composedestinations.navigation.dependency
-import com.ramcosta.composedestinations.rememberNavHostEngine
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         setContent {
-            val navController = rememberNavController()
-            val engine = rememberNavHostEngine()
-            val viewModel: AuthViewModel = viewModel()
-
-            WeSpotTheme {
-                Surface(
-                    modifier = Modifier.fillMaxSize(),
-                ) {
-                    DestinationsNavHost(
-                        navGraph = NavGraphs.root,
-                        navController = navController,
-                        engine = engine,
-                        dependenciesContainerBuilder = {
-                            dependency(viewModel)
-                        },
-                    )
-                }
-            }
         }
     }
 }

app/src/main/kotlin/com/bff/wespot/NavigatorImpl.kt

@@ -0,0 +1,16 @@
+package com.bff.wespot
+
+import android.content.Context
+import android.content.Intent
+import com.danggeun.navigation.Navigator
+import com.danggeun.navigation.util.buildIntent
+
+class NavigatorImpl : Navigator {
+    override fun navigateToMain(
+        context: Context,
+    ): Intent {
+        val intent = context.buildIntent<MainActivity>()
+        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+        return intent
+    }
+}

app/src/main/kotlin/com/bff/wespot/di/NavigationModule.kt

@@ -0,0 +1,17 @@
+package com.bff.wespot.di
+
+import com.bff.wespot.NavigatorImpl
+import com.danggeun.navigation.Navigator
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+interface NavigationModule {
+    @Binds
+    @Singleton
+    fun provideNavigator(navigator: NavigatorImpl): Navigator
+}

core/navigation/.gitignore

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

core/navigation/build.gradle.kts

@@ -0,0 +1,9 @@
+plugins {
+    alias(libs.plugins.wespot.android.library)
+    alias(libs.plugins.wespot.android.hilt)
+}
+
+
+android {
+    namespace = "com.bff.wespot.navigation"
+}

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/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/com/danggeun/navigation/Navigator.kt

@@ -0,0 +1,10 @@
+package com.danggeun.navigation
+
+import android.content.Context
+import android.content.Intent
+
+interface Navigator {
+    fun navigateToMain(
+        context: Context
+    ) : Intent
+}

core/navigation/src/main/java/com/danggeun/navigation/util/Extension.kt

@@ -0,0 +1,12 @@
+package com.danggeun.navigation.util
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import androidx.core.os.bundleOf
+
+inline fun <reified T : Activity> Context.buildIntent(
+    vararg argument: Pair<String, Any?>,
+) = Intent(this, T::class.java).apply {
+    putExtras(bundleOf(*argument))
+}

domain/src/main/kotlin/com/bff/wespot/domain/repository/usecase/KakaoLoginUseCase.kt → domain/src/main/kotlin/com/bff/wespot/domain/usecase/KakaoLoginUseCase.kt

@@ -1,4 +1,4 @@
-package com.bff.wespot.domain.repository.usecase
+package com.bff.wespot.domain.usecase
 
 import com.bff.wespot.domain.repository.auth.KakaoLoginManager
 import javax.inject.Inject

feature/auth/src/main/kotlin/com/bff/wespot/auth/AuthActivity.kt

@@ -0,0 +1,87 @@
+package com.bff.wespot.auth
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.Surface
+import androidx.compose.ui.Modifier
+import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.navigation.compose.rememberNavController
+import com.bff.wespot.auth.screen.NavGraphs
+import com.bff.wespot.auth.screen.destinations.ClassScreenDestination
+import com.bff.wespot.auth.screen.destinations.CompleteScreenDestination
+import com.bff.wespot.auth.screen.destinations.EditScreenDestination
+import com.bff.wespot.auth.screen.destinations.GenderScreenDestination
+import com.bff.wespot.auth.screen.destinations.GradeScreenDestination
+import com.bff.wespot.auth.screen.destinations.NameScreenDestination
+import com.bff.wespot.auth.screen.destinations.SchoolScreenDestination
+import com.bff.wespot.auth.state.AuthSideEffect
+import com.bff.wespot.auth.viewmodel.AuthViewModel
+import com.bff.wespot.designsystem.theme.WeSpotTheme
+import com.ramcosta.composedestinations.DestinationsNavHost
+import com.ramcosta.composedestinations.navigation.dependency
+import com.ramcosta.composedestinations.navigation.navigate
+import com.ramcosta.composedestinations.rememberNavHostEngine
+import org.orbitmvi.orbit.compose.collectSideEffect
+
+class AuthActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContent {
+            val navController = rememberNavController()
+            val engine = rememberNavHostEngine()
+            val viewModel: AuthViewModel = viewModel()
+
+            viewModel.collectSideEffect {
+                when (it) {
+                    AuthSideEffect.PopBackStack -> navController.popBackStack()
+                    is AuthSideEffect.NavigateToGradeScreen -> {
+                        navController.navigate(GradeScreenDestination(it.edit))
+                    }
+
+                    is AuthSideEffect.NavigateToSchoolScreen -> {
+                        navController.navigate(SchoolScreenDestination(it.edit))
+                    }
+
+                    is AuthSideEffect.NavigateToClassScreen -> {
+                        navController.navigate(ClassScreenDestination(it.edit))
+                    }
+
+                    is AuthSideEffect.NavigateToGenderScreen -> {
+                        navController.navigate(GenderScreenDestination(it.edit))
+                    }
+
+                    is AuthSideEffect.NavigateToNameScreen -> {
+                        navController.navigate(NameScreenDestination(it.edit))
+                    }
+
+                    AuthSideEffect.NavigateToEditScreen -> {
+                        navController.navigate(EditScreenDestination)
+                    }
+
+                    AuthSideEffect.NavigateToCompleteScreen -> {
+                        navController.navigate(CompleteScreenDestination, navOptionsBuilder = {
+                            popUpTo(SchoolScreenDestination.route) { inclusive = true }
+                        })
+                    }
+                }
+            }
+
+            WeSpotTheme {
+                Surface(
+                    modifier = Modifier.fillMaxSize(),
+                ) {
+                    DestinationsNavHost(
+                        navGraph = NavGraphs.root,
+                        navController = navController,
+                        engine = engine,
+                        dependenciesContainerBuilder = {
+                            dependency(viewModel)
+                        },
+                    )
+                }
+            }
+        }
+    }
+}

feature/auth/src/main/kotlin/com/bff/wespot/auth/screen/ClassScreen.kt

@@ -23,16 +23,15 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import com.bff.wespot.auth.R
-import com.bff.wespot.auth.screen.destinations.GenderScreenDestination
 import com.bff.wespot.auth.state.AuthAction
+import com.bff.wespot.auth.state.NavigationAction
 import com.bff.wespot.auth.viewmodel.AuthViewModel
 import com.bff.wespot.designsystem.component.button.WSButton
 import com.bff.wespot.designsystem.component.header.WSTopBar
 import com.bff.wespot.designsystem.component.input.WsTextField
 import com.bff.wespot.designsystem.theme.StaticTypeScale
 import com.bff.wespot.designsystem.theme.WeSpotThemeManager
 import com.ramcosta.composedestinations.annotation.Destination
-import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import kotlinx.coroutines.delay
 import org.orbitmvi.orbit.compose.collectAsState
 
@@ -42,7 +41,6 @@ import org.orbitmvi.orbit.compose.collectAsState
 fun ClassScreen(
     viewModel: AuthViewModel,
     edit: Boolean,
-    navigator: DestinationsNavigator,
 ) {
     val keyboard = LocalSoftwareKeyboardController.current
 
@@ -56,7 +54,7 @@ fun ClassScreen(
                 title = stringResource(id = R.string.register),
                 canNavigateBack = true,
                 navigateUp = {
-                    navigator.navigateUp()
+                    action(AuthAction.Navigation(NavigationAction.PopBackStack))
                 },
             )
         },
@@ -120,10 +118,10 @@ fun ClassScreen(
         WSButton(
             onClick = {
                 if (edit) {
-                    navigator.popBackStack()
+                    action(AuthAction.Navigation(NavigationAction.PopBackStack))
                     return@WSButton
                 }
-                navigator.navigate(GenderScreenDestination(edit = false))
+                action(AuthAction.Navigation(NavigationAction.NavigateToGenderScreen(false)))
             },
             text = stringResource(
                 id = if (edit) {