[feature] #9 - myInfo 재구현

app/src/main/java/org/sopt/and/MainActivity.kt

@@ -3,64 +3,19 @@ package org.sopt.and
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
-import androidx.compose.runtime.Composable
-import androidx.lifecycle.viewmodel.compose.viewModel
-import androidx.navigation.NavGraph.Companion.findStartDestination
-import androidx.navigation.compose.NavHost
-import androidx.navigation.compose.composable
-import androidx.navigation.compose.rememberNavController
-import org.sopt.and.navigation.SignNavigation
-import org.sopt.and.signup.SignUpScreen
-
-import org.sopt.and.signin.SignInScreen
-
+import org.sopt.and.data.service.AppContext
+import org.sopt.and.presentation.navigation.Navigation
 import org.sopt.and.ui.theme.ANDANDROIDTheme
-import org.sopt.and.presentation.viewmodel.SignViewModel
 
-import dagger.hilt.android.AndroidEntryPoint
-
-@AndroidEntryPoint
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        enableEdgeToEdge()
+        AppContext.init(this)
+
         setContent {
             ANDANDROIDTheme {
-                val signViewModel: SignViewModel = viewModel()
-                MyApp(signViewModel)
+                Navigation()
             }
         }
     }
-}
-
-@Composable
-fun MyApp(signViewModel: SignViewModel) {
-    val navController = rememberNavController()
-
-    NavHost(navController, startDestination = SignNavigation.SignUp.route) {
-        composable(SignNavigation.SignUp.route) {
-            SignUpScreen(
-                signViewModel = signViewModel,
-//                onNavigateBack = { navController.popBackStack() },
-                onNavigateToSignIn = { navController.navigate("signIn") },
-            )
-        }
-        composable(SignNavigation.SignIn.route) {
-            SignInScreen(
-                signViewModel = signViewModel,
-                onNavigateToMain = {navController.navigate("main"){
-                    popUpTo(navController.graph.findStartDestination().id) { saveState = true }
-                    launchSingleTop = true
-                }},
-                onNavigateToSignUp = {navController.navigate("signUp")}
-
-            )
-        }
-
-        composable(SignNavigation.Main.route) {
-            MainScreen(signViewModel = signViewModel)
-        }
-    }
-}
-
+}

app/src/main/java/org/sopt/and/data/mapper/Mapper.kt

@@ -2,7 +2,7 @@ package org.sopt.and.data.mapper
 
 import org.sopt.and.data.model.request.SignInRequestDto
 import org.sopt.and.data.model.request.SignUpRequestDto
-import org.sopt.and.data.model.response.GetMyHobbyResponseResultDto
+import org.sopt.and.data.model.response.MyHobbyResponseResultDto
 import org.sopt.and.data.model.response.SignInResponseDto
 import org.sopt.and.data.model.response.SignUpResponseDto
 import org.sopt.and.domain.model.MyHobbyEntity
@@ -13,7 +13,7 @@ import org.sopt.and.domain.model.SignUpResponseEntity
 import retrofit2.Response
 
 object Mapper {
-    fun toMyHobbyEntity(getHobbyResponseResultDto: GetMyHobbyResponseResultDto) =
+    fun toMyHobbyEntity(getHobbyResponseResultDto: MyHobbyResponseResultDto) =
         MyHobbyEntity(myHobby = getHobbyResponseResultDto.myHobby)
 
     fun toSignUpResponseEntity(signUpResponseDto: Response<SignUpResponseDto>) =

app/src/main/java/org/sopt/and/data/repositoryimpl/MyHobbyRepositoryImpl.kt

@@ -1,13 +1,13 @@
 package org.sopt.and.data.repositoryimpl
 
-import org.sopt.and.data.datasource.GetMyHobbyDataSource
+import org.sopt.and.data.datasource.MyHobbyDataSource
 import org.sopt.and.data.mapper.Mapper
 import org.sopt.and.domain.model.MyHobbyEntity
-import org.sopt.and.domain.usecase.GetMyHobbyRepository
+import org.sopt.and.domain.repository.MyHobbyRepository
 
 class MyHobbyRepositoryImpl(
-    private val getMyHobbyDataSource: GetMyHobbyDataSource
-) : GetMyHobbyRepository {
+    private val getMyHobbyDataSource: MyHobbyDataSource
+) : MyHobbyRepository {
     override suspend fun getMyHobby(): Result<MyHobbyEntity> =
         runCatching {
             getMyHobbyDataSource.getMyHobby().result?.let { Mapper.toMyHobbyEntity(it) }!!

app/src/main/java/org/sopt/and/data/repositoryimpl/SignInRepositoryImpl.kt

@@ -4,7 +4,7 @@ import org.sopt.and.data.datasource.SignInDataSource
 import org.sopt.and.data.mapper.Mapper
 import org.sopt.and.domain.model.SignInInformationEntity
 import org.sopt.and.domain.model.SignInResponseEntity
-import org.sopt.and.domain.usecase.SignInRepository
+import org.sopt.and.domain.repository.SignInRepository
 
 class SignInRepositoryImpl(
     private val signInDataSource: SignInDataSource

app/src/main/java/org/sopt/and/data/repositoryimpl/SignUpRepositoryImpl.kt

@@ -4,7 +4,7 @@ import org.sopt.and.data.datasource.SignUpDataSource
 import org.sopt.and.data.mapper.Mapper
 import org.sopt.and.domain.model.SignUpInformationEntity
 import org.sopt.and.domain.model.SignUpResponseEntity
-import org.sopt.and.domain.usecase.SignUpRepository
+import org.sopt.and.domain.repository.SignUpRepository
 
 class SignUpRepositoryImpl(
     private val signUpDataSource: SignUpDataSource

app/src/main/java/org/sopt/and/data/service/UserService.kt

@@ -17,5 +17,5 @@ interface UserService {
     suspend fun signIn(@Body request: SignInRequestDto): Response<SignInResponseDto>
 
     @GET("/user/my-hobby")
-    suspend fun getMyHobby(): GetMyHobbyResponseDto
+    suspend fun getMyHobby(): MyHobbyResponseDto
 }

app/src/main/java/org/sopt/and/domain/repository/MyHobbyRepository.kt

@@ -1,17 +1,17 @@
 package org.sopt.and.domain.repository
 
-import org.sopt.and.data.datasource.GetMyHobbyDataSource
-import org.sopt.and.data.repositoryimpl.GetMyHobbyRepositoryImpl
+import org.sopt.and.data.datasource.MyHobbyDataSource
+import org.sopt.and.data.repositoryimpl.MyHobbyRepositoryImpl
 import org.sopt.and.data.service.ServicePool
 import org.sopt.and.domain.model.MyHobbyEntity
 
 interface MyHobbyRepository {
     suspend fun getMyHobby(): Result<MyHobbyEntity>
 
     companion object {
-        fun create(): GetMyHobbyRepositoryImpl {
-            return GetMyHobbyRepositoryImpl(
-                GetMyHobbyDataSource(
+        fun create(): MyHobbyRepositoryImpl {
+            return MyHobbyRepositoryImpl(
+                MyHobbyDataSource(
                     ServicePool.userService
                 )
             )

app/src/main/java/org/sopt/and/domain/usecase/MyHobbyUseCase.kt

@@ -1,10 +1,10 @@
 package org.sopt.and.domain.usecase
 
 import org.sopt.and.domain.model.MyHobbyEntity
-import org.sopt.and.domain.repository.GetMyHobbyRepository
+import org.sopt.and.domain.repository.MyHobbyRepository
 
 class MyHobbyUseCase(
-    private val getMyHobbyRepository: GetMyHobbyRepository
+    private val getMyHobbyRepository: MyHobbyRepository
 ) {
     suspend operator fun invoke(): Result<MyHobbyEntity> =
         getMyHobbyRepository.getMyHobby()

app/src/main/java/org/sopt/and/MainScreen.kt → app/src/main/java/org/sopt/and/presentation/MainScreen.kt

@@ -1,4 +1,4 @@
-package org.sopt.and
+package org.sopt.and.presentation
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.RowScope
@@ -20,8 +20,8 @@ import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
-import org.sopt.and.navigation.BottomNavigationGraph
-import org.sopt.and.navigation.BottomNavigation
+import org.sopt.and.presentation.navigation.BottomNavigationGraph
+import org.sopt.and.presentation.navigation.BottomNavigation
 import org.sopt.and.presentation.viewmodel.SignViewModel
 
 @Composable

app/src/main/java/org/sopt/and/home/HomeScreen.kt → app/src/main/java/org/sopt/and/presentation/home/HomeScreen.kt

@@ -1,4 +1,4 @@
-package org.sopt.and.home
+package org.sopt.and.presentation.home
 
 import androidx.annotation.StringRes
 import androidx.compose.foundation.Image

app/src/main/java/org/sopt/and/presentation/myinfo/MyInfoUiState.kt

@@ -0,0 +1,5 @@
+package org.sopt.and.presentation.myinfo
+
+data class MyInfoUiState(
+    val myHobby: String = "오류"
+)

app/src/main/java/org/sopt/and/presentation/myinfo/MyInfoViewModel.kt

@@ -0,0 +1,30 @@
+package org.sopt.and.presentation.myinfo
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+import org.sopt.and.domain.model.MyHobbyEntity
+import org.sopt.and.domain.usecase.MyHobbyUseCase
+
+class MyInfoViewModel(
+    private val getMyHobbyUseCase: MyHobbyUseCase
+) : ViewModel() {
+
+    private val _uiState = MutableStateFlow(MyInfoUiState())
+    val uiState: StateFlow<MyInfoUiState> = _uiState.asStateFlow()
+
+    private fun setMyHobby(myHobby: String) {
+        _uiState.value = _uiState.value.copy(myHobby = myHobby)
+    }
+
+    fun getMyHobby() {
+        viewModelScope.launch {
+            getMyHobbyUseCase().onSuccess { myHobbyEntity: MyHobbyEntity ->
+                setMyHobby(myHobbyEntity.myHobby)
+            }.onFailure { }
+        }
+    }
+}

app/src/main/java/org/sopt/and/myinfo/MyScreen.kt → app/src/main/java/org/sopt/and/presentation/myinfo/MyScreen.kt

@@ -1,4 +1,4 @@
-package org.sopt.and.myinfo
+package org.sopt.and.presentation.myinfo
 
 import android.annotation.SuppressLint
 import android.util.Log