refactor: 홈, 마이페이지 네비게이션 옵션설정

core/navigation/src/main/java/com/teamoffroad/core/navigation/RouteModel.kt

@@ -75,7 +75,9 @@ sealed interface MyPageRoute : Route {
     ) : MyPageRoute
 
     @Serializable
-    data object GainedCharacter : MyPageRoute
+    data class GainedCharacter(
+        val beforeNavigateRoute: String,
+    ) : MyPageRoute
 
     @Serializable
     data object GainedEmblems : MyPageRoute
@@ -136,6 +138,7 @@ sealed interface DiaryRoute : Route {
     @Serializable
     data class Diary(
         val newDiaryExist: Boolean,
+        val beforeNavigateRoute: String,
         val characterName: String,
     ) : DiaryRoute
 }

feature/diary/src/main/java/com/teamoffroad/feature/diary/component/DiaryHintDialog.kt

@@ -85,7 +85,7 @@ fun DiaryHintDialog(
         HorizontalPager(
             verticalAlignment = Alignment.Top,
             state = pagerState,
-            userScrollEnabled = false,
+            userScrollEnabled = true,
             modifier = Modifier.weight(1f),
         ) { page ->
             when (page) {

feature/diary/src/main/java/com/teamoffroad/feature/diary/navigation/DiaryNavigation.kt

@@ -8,8 +8,8 @@ import com.teamoffroad.core.navigation.DiaryRoute
 import com.teamoffroad.core.navigation.RecommendPlaceRoute
 import com.teamoffroad.feature.diary.presentation.DiaryScreen
 
-fun NavController.navigateToDiary(newDiaryExist: Boolean, characterName: String) {
-    navigate(DiaryRoute.Diary(newDiaryExist, characterName))
+fun NavController.navigateToDiary(newDiaryExist: Boolean, beforeNavigateRoute: String, characterName: String) {
+    navigate(DiaryRoute.Diary(newDiaryExist, beforeNavigateRoute, characterName))
 }
 
 fun NavGraphBuilder.diaryNavGraph(
@@ -19,9 +19,11 @@ fun NavGraphBuilder.diaryNavGraph(
 ) {
     composable<DiaryRoute.Diary> { backStackEntry ->
         val newDiaryExist = backStackEntry.toRoute<DiaryRoute.Diary>().newDiaryExist
+        val beforeNavigateRoute = backStackEntry.toRoute<DiaryRoute.Diary>().beforeNavigateRoute
         val characterName = backStackEntry.toRoute<DiaryRoute.Diary>().characterName
         DiaryScreen(
             newDiaryExist = newDiaryExist,
+            beforeNavigateRoute= beforeNavigateRoute,
             characterName = characterName,
             navigateToBack = navigateToBack,
             navigateToCharacterChat = navigateToCharacterChat,

feature/diary/src/main/java/com/teamoffroad/feature/diary/presentation/DiaryScreen.kt

@@ -40,6 +40,7 @@ import kotlinx.coroutines.flow.collectLatest
 @Composable
 fun DiaryScreen(
     newDiaryExist: Boolean,
+    beforeNavigateRoute: String,
     characterName: String,
     navigateToBack: () -> Unit,
     navigateToCharacterChat: (String) -> Unit,
@@ -94,7 +95,7 @@ fun DiaryScreen(
                 ),
         ) {
             NavigateBackAppBar(
-                text = stringResource(id = R.string.diary_back_home),
+                text = stringResource(id = if (beforeNavigateRoute == "home") R.string.diary_back_home else R.string.diary_back_mypage),
                 modifier = Modifier.padding(top = 20.dp)
             ) {
                 viewModel.updateNavigationBackState()

feature/diary/src/main/res/values/string.xml

@@ -3,6 +3,7 @@
     <string name="diary_empty_content">만들어진 일기가 없어요\n\n오브가 아직 어색한가 봐요\n조금 더 대화를 나눠보세요.</string>
     <string name="diary_empty_go_chatting">채팅하러 가기</string>
     <string name="diary_back_home">홈</string>
+    <string name="diary_back_mypage">마이페이지</string>
     <string name="diary_memory_light">기억빛</string>
     <string name="diary_year">년</string>
     <string name="diary_month">월</string>

feature/home/src/main/java/com/teamoffroad/feature/home/navigation/HomeNavigation.kt

@@ -16,9 +16,9 @@ fun NavController.navigateToHome(navOptions: NavOptions) {
 @RequiresApi(Build.VERSION_CODES.TIRAMISU)
 fun NavGraphBuilder.homeNavGraph(
     navigateToBack: () -> Unit,
-    navigateToGainedCharacter: () -> Unit,
+    navigateToGainedCharacter: (String) -> Unit,
     navigateToCharacterChatScreen: (String) -> Unit,
-    navigateToDiary: (Boolean, String) -> Unit,
+    navigateToDiary: (Boolean,String, String) -> Unit,
     navigateToRecommendPlace: (Boolean, String, String) -> Unit,
 ) {
     composable<MainTabRoute.Home> {

feature/home/src/main/java/com/teamoffroad/feature/home/presentation/HomeScreen.kt

@@ -45,9 +45,11 @@ import com.teamoffroad.characterchat.presentation.model.CharacterChatLastUnreadU
 import com.teamoffroad.core.designsystem.component.OrbDialog
 import com.teamoffroad.core.designsystem.component.actionBarPadding
 import com.teamoffroad.feature.home.domain.model.UserQuests
+import com.teamoffroad.feature.home.presentation.component.CharacterImage
+import com.teamoffroad.feature.home.presentation.component.CharacterNameText
 import com.teamoffroad.feature.home.presentation.component.CloseCompleteRequest
 import com.teamoffroad.feature.home.presentation.component.CompleteQuestDialog
-import com.teamoffroad.feature.home.presentation.component.HomeCharacterItem
+import com.teamoffroad.feature.home.presentation.component.EmblemNameText
 import com.teamoffroad.feature.home.presentation.component.HomeIcons
 import com.teamoffroad.feature.home.presentation.component.NicknameText
 import com.teamoffroad.feature.home.presentation.component.RecentQuest
@@ -58,9 +60,9 @@ import com.teamoffroad.offroad.feature.home.R
 @RequiresApi(Build.VERSION_CODES.TIRAMISU)
 @Composable
 fun HomeScreen(
-    navigateToGainedCharacter: () -> Unit = {},
+    navigateToGainedCharacter: (String) -> Unit = {},
     navigateToCharacterChatScreen: (String) -> Unit,
-    navigateToDiary: (Boolean, String) -> Unit,
+    navigateToDiary: (Boolean, String, String) -> Unit,
     navigateToRecommendPlace: (Boolean, String, String) -> Unit,
 ) {
     val context = LocalContext.current
@@ -162,7 +164,7 @@ fun HomeScreen(
             cancelButtonText = stringResource(id = R.string.home_diary_create_cancel),
             nextButtonText = stringResource(id = R.string.home_confirm),
             onClick = {
-                if (!newDiaryExist.value) navigateToDiary(true, characterName.value)
+                if (!newDiaryExist.value) navigateToDiary(true, "home", characterName.value)
                 homeViewModel.updateDiaryCreateDialogUnShown()
             },
             onCancelClick = {
@@ -202,12 +204,12 @@ private fun UsersAdventuresInformation(
     modifier: Modifier = Modifier,
     homeViewModel: HomeViewModel,
     characterChatLastUnreadUiState: State<CharacterChatLastUnreadUiState>,
-    navigateToGainedCharacter: () -> Unit,
+    navigateToGainedCharacter: (String) -> Unit,
     updateShowUserChatTextField: (Boolean) -> Unit,
     updateCharacterChatExist: (Boolean) -> Unit,
     updateCharacterName: (String) -> Unit,
     updateLastUnreadChatDosAllRead: (Boolean) -> Unit,
-    navigateToDiary: (Boolean, String) -> Unit,
+    navigateToDiary: (Boolean, String, String) -> Unit,
     navigateToRecommendPlace: (Boolean, String, String) -> Unit,
 ) {
     val adventuresInformationState =
@@ -253,7 +255,7 @@ private fun UsersAdventuresInformation(
 
         Column {
             NicknameText(adventuresInformationData?.nickname ?: "")
-            HomeCharacterItem().CharacterNameText(adventuresInformationData?.characterName ?: "")
+            CharacterNameText(adventuresInformationData?.characterName ?: "")
         }
 
         Box(
@@ -262,11 +264,11 @@ private fun UsersAdventuresInformation(
                 Modifier
                     .align(Alignment.BottomCenter),
         ) {
-            HomeCharacterItem().CharacterImage(homeViewModel, context)
+            CharacterImage(homeViewModel, context)
         }
     }
     Spacer(modifier = Modifier.padding(10.dp))
-    HomeCharacterItem().EmblemNameText(context, Modifier)
+    EmblemNameText(context, Modifier)
 }
 
 @Composable