[mod/#155] Mypage 뷰 개선

app/src/main/java/com/paw/key/core/designsystem/theme/Type.kt

@@ -420,7 +420,7 @@ fun pawKeyTypography(): PawKeyTypography {
         ),
         mainButtonActive = pawKeyTextStyle(
             fontFamily = PretendardRegular,
-            fontWeight = FontWeight.Normal,
+            fontWeight = FontWeight.SemiBold,
             fontSize = 18.sp,
             lineHeight = 16.sp,
             letterSpacing = 0.em

app/src/main/java/com/paw/key/data/dto/response/petprofile/PetProfileResponseDto.kt

@@ -1,5 +1,6 @@
 package com.paw.key.data.dto.response.petprofile
 
+import androidx.core.net.toUri
 import com.paw.key.domain.model.entity.petprofile.PetProfileEntity
 import com.paw.key.domain.model.entity.petprofile.TraitEntity
 import kotlinx.serialization.SerialName
@@ -35,7 +36,7 @@ data class PetProfileResponseDto(
     val traits: List<TraitDto>,
 
     @SerialName("walkCount")
-    val walkCount: Int
+    val walkCount: Int,
 ) {
     fun toEntity() = PetProfileEntity(
         petId = petId,
@@ -45,7 +46,7 @@ data class PetProfileResponseDto(
         age = age,
         isAgeKnown = isAgeKnown,
         breed = breed,
-        imageUrl = imageUrl,
+        imageUrl = imageUrl.toUri(),
         walkCount = walkCount,
         traits = traits.map { it.toEntity() }
     )
@@ -57,9 +58,8 @@ data class TraitDto(
     val category: String,
 
     @SerialName("option")
-    val option: String
-)
-{
+    val option: String,
+) {
     fun toEntity() = TraitEntity(
         category = category,
         option = option

app/src/main/java/com/paw/key/domain/model/entity/petprofile/PetProfileEntity.kt

@@ -1,5 +1,7 @@
 package com.paw.key.domain.model.entity.petprofile
 
+import android.net.Uri
+
 data class PetProfileEntity(
     val petId: Long,
     val name: String,
@@ -8,7 +10,7 @@ data class PetProfileEntity(
     val age: Int,
     val isAgeKnown: Boolean,
     val breed: String,
-    val imageUrl: String,
+    val imageUrl: Uri,
     val traits: List<TraitEntity>,
     val walkCount: Int
 )

app/src/main/java/com/paw/key/presentation/ui/main/MainNavigator.kt

@@ -21,13 +21,12 @@ import com.paw.key.presentation.ui.dummy.next.navigateDummyNext
 import com.paw.key.presentation.ui.home.navigation.navigateHome
 import com.paw.key.presentation.ui.home.navigation.navigateHomeLocationSetting
 import com.paw.key.presentation.ui.login.navigation.navigateLogin
-import com.paw.key.presentation.ui.mypage.navigation.navigateArchivedCourse
-import com.paw.key.presentation.ui.mypage.navigation.navigateArchivedDetail
-import com.paw.key.presentation.ui.mypage.navigation.navigateMyPage
-import com.paw.key.presentation.ui.mypage.navigation.navigatePetProfile
-import com.paw.key.presentation.ui.mypage.navigation.navigateSavedCourse
-import com.paw.key.presentation.ui.mypage.navigation.navigateSavedDetail
-import com.paw.key.presentation.ui.mypage.navigation.navigateUserProfile
+import com.paw.key.presentation.ui.mypage.courseinfo.model.CourseType
+import com.paw.key.presentation.ui.mypage.courseinfo.navigation.navigateCourseInfo
+import com.paw.key.presentation.ui.mypage.main.navigation.navigateMyPage
+import com.paw.key.presentation.ui.mypage.petinfo.navigation.navigatePetProfile
+import com.paw.key.presentation.ui.mypage.petinfo.navigation.navigatePetProfileList
+import com.paw.key.presentation.ui.mypage.userinfo.navigation.navigateUserProfile
 import com.paw.key.presentation.ui.onboard.navigation.navigateOnboarding
 import com.paw.key.presentation.ui.region.navigation.navigateRegional
 import com.paw.key.presentation.ui.signup.navigation.navigateSignUp
@@ -96,32 +95,24 @@ class MainNavigator(
         navController.navigatePetProfile(navOptions = navOptions)
     }
 
-    fun navigateSavedCourse(navOptions: NavOptions? = null) {
-        navController.navigateSavedCourse(navOptions = navOptions)
+    fun navigatePetProfileList(navOptions: NavOptions? = null) {
+        navController.navigatePetProfileList(navOptions = navOptions)
     }
-
-    fun navigateSavedDetail(
-        pageId: Int,
-        routeId: Int,
-        navOptions: NavOptions? = null)
-    {
-        navController.navigateSavedDetail(
-            pageId = pageId,
-            routeId = routeId,
-            navOptions = navOptions
-        )
+
+    fun navigateCourseInfo(
+        courseType: CourseType,
+        navOptions: NavOptions? = null,
+    ) {
+        navController.navigateCourseInfo(courseType = courseType, navOptions = navOptions)
     }
 
     // Todo : 나중에 로직 플로우 확인하고 수정예정
     fun navigateSignUp(navOptions: NavOptions? = null) {
         navController.navigateSignUp(navOptions)
     }
-
-    fun navigateArchivedCourse(navOptions: NavOptions? = null) {
-        navController.navigateArchivedCourse(navOptions = navOptions)
-    }
 
-    fun navigateCourse(index : Int = 0, navOptions: NavOptions? = null) {
+
+    fun navigateCourse(index: Int = 0, navOptions: NavOptions? = null) {
         navController.navigateCourse(
             index = index,
             navOptions = navOptions
@@ -142,9 +133,9 @@ class MainNavigator(
 //    }
     fun navigateSharedWalkCourse(
         routeId: Int,
-        pageId : Int,
-        navOptions: NavOptions? = null)
-    {
+        pageId: Int,
+        navOptions: NavOptions? = null,
+    ) {
         navController.navigateSharedWalkCourse(
             routeId = routeId,
             pageId = pageId,
@@ -155,7 +146,7 @@ class MainNavigator(
     fun navigateSharedWalkReview(
         pageId: Int,
         routeId: Int,
-        navOptions: NavOptions? = null
+        navOptions: NavOptions? = null,
     ) {
         navController.navigateSharedWalkReview(
             pageId = pageId,
@@ -167,7 +158,7 @@ class MainNavigator(
     fun navigateSharedWalkCompletion(
         pageId: Int,
         routeId: Int,
-        navOptions: NavOptions? = null
+        navOptions: NavOptions? = null,
     ) {
         navController.navigateSharedWalkCompletion(
             pageId = pageId,
@@ -176,23 +167,11 @@ class MainNavigator(
         )
     }
 
-    fun navigateArchivedDetail(
-        routeId: Int,
-        pageId : Int,
-        navOptions: NavOptions? = null
-    ) {
-        navController.navigateArchivedDetail(
-            pageId = pageId,
-            routeId = routeId,
-            navOptions = navOptions
-        )
-    }
-
     fun navigateWalkCourse(navOptions: NavOptions? = null) {
         navController.navigateWalkCourse(navOptions = navOptions)
     }
 
-    fun navigateWalkCompletion(routeId : Int, navOptions: NavOptions? = null) {
+    fun navigateWalkCompletion(routeId: Int, navOptions: NavOptions? = null) {
         navController.navigateWalkCompletion(
             routeId = routeId,
             navOptions = navOptions
@@ -219,7 +198,6 @@ class MainNavigator(
     }
 
 
-
     @Composable
     fun showBottomBar() = MainTab.contains {
         currentDestination?.hasRoute(it::class) == true

app/src/main/java/com/paw/key/presentation/ui/main/MainTab.kt

@@ -4,16 +4,16 @@ import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.compose.runtime.Composable
 import com.paw.key.R
-import com.paw.key.core.navigation.MainTabRoute
-import com.paw.key.presentation.ui.home.navigation.Home
-import com.paw.key.presentation.ui.course.entire.navigation.Course
-import com.paw.key.presentation.ui.community.navigation.Community
-import com.paw.key.presentation.ui.mypage.navigation.MyPage
-import com.paw.key.R.string.ic_home_description
-import com.paw.key.R.string.ic_course_description
 import com.paw.key.R.string.ic_community_description
+import com.paw.key.R.string.ic_course_description
+import com.paw.key.R.string.ic_home_description
 import com.paw.key.R.string.ic_mypage_description
+import com.paw.key.core.navigation.MainTabRoute
 import com.paw.key.core.navigation.Route
+import com.paw.key.presentation.ui.community.navigation.Community
+import com.paw.key.presentation.ui.course.entire.navigation.Course
+import com.paw.key.presentation.ui.home.navigation.Home
+import com.paw.key.presentation.ui.mypage.main.navigation.MyPage
 
 
 enum class MainTab(

app/src/main/java/com/paw/key/presentation/ui/main/PawKeyNavHost.kt

@@ -25,13 +25,11 @@ import com.paw.key.presentation.ui.dummy.next.dummyNextNavGraph
 import com.paw.key.presentation.ui.home.navigation.homeLocationSettingNavGraph
 import com.paw.key.presentation.ui.home.navigation.homeNavGraph
 import com.paw.key.presentation.ui.login.navigation.loginNavGraph
-import com.paw.key.presentation.ui.mypage.navigation.archivedCourseNavGraph
-import com.paw.key.presentation.ui.mypage.navigation.archivedDetailNavGraph
-import com.paw.key.presentation.ui.mypage.navigation.myPageNavGraph
-import com.paw.key.presentation.ui.mypage.navigation.petProfileNavGraph
-import com.paw.key.presentation.ui.mypage.navigation.savedCourseNavGraph
-import com.paw.key.presentation.ui.mypage.navigation.savedDetailNavGraph
-import com.paw.key.presentation.ui.mypage.navigation.userProfileNavGraph
+import com.paw.key.presentation.ui.mypage.courseinfo.navigation.courseInfoNavGraph
+import com.paw.key.presentation.ui.mypage.main.navigation.myPageNavGraph
+import com.paw.key.presentation.ui.mypage.petinfo.navigation.petProfileListNavGraph
+import com.paw.key.presentation.ui.mypage.petinfo.navigation.petProfileNavGraph
+import com.paw.key.presentation.ui.mypage.userinfo.navigation.userProfileNavGraph
 import com.paw.key.presentation.ui.onboard.navigation.onboardingNavGraph
 import com.paw.key.presentation.ui.region.navigation.regionalNavGraph
 import com.paw.key.presentation.ui.signup.navigation.signUpNavGraph
@@ -100,10 +98,7 @@ fun PawKeyNavHost(
             navigateNext = navigator::navigateWalkCourse,
             navigateToDetail = { postId, routeId ->
                 // Todo : 마찬가지로 이것도 그냥 넣어놓음 나중에 리스트 연결 후 예쩡 / 리스트 아이템이동
-                navigator.navigateArchivedDetail(
-                    pageId = postId,
-                    routeId = routeId
-                )
+
             },
             setOnVisibleRecord = navigator::setOnVisibleRecord,
             snackBarHostState = snackbarHostState
@@ -169,10 +164,7 @@ fun PawKeyNavHost(
             navigateUp = navigator::navigateUp,
             navigateNext = navigator::navigateCourse,
             navigateShared = { routeId, pageId ->
-                navigator.navigateArchivedDetail(
-                    pageId = pageId,
-                    routeId = routeId
-                )
+
             },
             snackBarHostState = snackbarHostState
         )
@@ -187,54 +179,16 @@ fun PawKeyNavHost(
         myPageNavGraph(
             paddingValues = paddingValues,
             navigateUp = navigator::navigateUp,
-            navigateUserProfile = navigator::navigateUserProfile,
             navigatePetProfile = navigator::navigatePetProfile,
-            navigateArchivedCourse = navigator::navigateArchivedCourse,
-            navigateSavedCourse = navigator::navigateSavedCourse,
-            snackBarHostState = snackbarHostState
-        )
-
-        savedCourseNavGraph(
-            paddingValues = paddingValues,
-            navigateUp = navigator::navigateUp,
-            navigateNext = { routeId, pageId ->
-                navigator.navigateSavedDetail(
-                    pageId = pageId,
-                    routeId = routeId
-                )
-            },
-            snackBarHostState = snackbarHostState
-        )
-
-        archivedCourseNavGraph(
-            navigateUp = navigator::navigateUp,
-            navigateNext = { routeId, pageId ->
-                navigator.navigateArchivedDetail(
-                    pageId = pageId,
-                    routeId = routeId
-                )
+            navigateCourseInfo = { courseType ->
+                navigator.navigateCourseInfo(courseType)
             },
-            modifier = modifier
-        )
-
-        savedDetailNavGraph(
-            navigateUp = navigator::navigateUp,
-            navigateToWalk = navigator::navigateWalkCourse,
-            snackBarHostState = snackbarHostState
+            navigatePetProfileList = navigator::navigatePetProfileList,
+            navigateUserProfile = navigator::navigateUserProfile,
         )
 
-        archivedDetailNavGraph(
-            // Todo 그냥 리스트에서 상세보기 후 뒤로가기
+        courseInfoNavGraph(
             navigateUp = navigator::navigateUp,
-            /*navigateDetail = {
-                navigator.navController.navigateCourse(index = 1, navOptions = null)
-            },*/
-            navigateToSharedWalk = { routeId, pageId ->
-                navigator.navigateSharedWalkCourse(
-                    routeId = routeId,
-                    pageId = pageId
-                )
-            },
             modifier = modifier
         )
 
@@ -250,6 +204,11 @@ fun PawKeyNavHost(
             modifier = modifier
         )
 
+        petProfileListNavGraph(
+            navigateUp = navigator::navigateUp,
+            navigatePetProfile = navigator::navigatePetProfile,
+        )
+
         dummyNavGraph(
             paddingValues = paddingValues,
             navigateUp = navigator::navigateUp,