FEAT: 프로필 설정 링크 정보 받아오기 (#104)

Mnseo · Feb 9, 2024 · da60923 · da60923
1 parent 629d65d
commit da60923
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 21 deletions.
diff --git a/domain/src/main/java/com/kusitms/domain/model/profile/LinkModel.kt b/domain/src/main/java/com/kusitms/domain/model/profile/LinkModel.kt
@@ -4,3 +4,4 @@ data class LinkModel(
     val type: String = "",
     val link: String = ""
 )
+
diff --git a/...ntation/src/main/java/com/kusitms/presentation/model/profile/edit/ProfileEditViewModel.kt b/...ntation/src/main/java/com/kusitms/presentation/model/profile/edit/ProfileEditViewModel.kt
@@ -146,10 +146,11 @@ class ProfileEditViewModel @Inject constructor(
 
 
     fun addLinkItem() {
-        val newLinkItem = LinkItem(LinkType.LINK, "") //기본 설정값
-        _linkItems.value = _linkItems.value + newLinkItem
+        val newLinkItems =  LinkItem(LinkType.LINK, "") //기본 설정값
+        _linkItems.value = _linkItems.value + newLinkItems
     }
 
+
     fun updateLinkItem(index: Int, linkType: LinkType, url: String) {
         val updatedItems = _linkItems.value.toMutableList()
         if (index in updatedItems.indices) {
@@ -208,6 +209,12 @@ class ProfileEditViewModel @Inject constructor(
                 _detailMemberInfo = profileResult.getOrNull()!!
                 _major.value = _detailMemberInfo.major.toString()
                 _selectedPart.value = mapPartToKorean(_detailMemberInfo.part.toString())
+                _linkItems.value = _detailMemberInfo.links?.map { linkModel ->
+                    LinkItem(
+                        linkType = mapLinkType(linkModel.type),
+                        linkUrl = linkModel.link
+                    )
+                } ?: emptyList()
 
                 detailMemberInfo = _detailMemberInfo
             }
@@ -222,4 +229,18 @@ class ProfileEditViewModel @Inject constructor(
             else -> part
         }
     }
-}
+
+
+    private fun mapLinkType(type: String): LinkType {
+        return when (type) {
+            "LINK" -> LinkType.LINK
+            "BRUNCH" -> LinkType.BRUNCH
+            "TISTORY" -> LinkType.TISTORY
+            "NOTION" -> LinkType.NOTION
+            "BEHANCE" -> LinkType.BEHANCE
+            "LINKEDIN" -> LinkType.LINKEDIN
+            "GITHUB" -> LinkType.GITHUB
+            else -> LinkType.LINK
+        }
+    }
+}
diff --git a/presentation/src/main/java/com/kusitms/presentation/model/signIn/LinkCategory.kt b/presentation/src/main/java/com/kusitms/presentation/model/signIn/LinkCategory.kt
@@ -13,7 +13,7 @@ data class LinkItem(
 )
 
 enum class LinkType(val displayName: String, @DrawableRes val iconRes: Int?) {
-    LINK("Link", R.drawable.ic_github),
+    LINK("Link", R.drawable.ic_link),
     BRUNCH("Brunch", R.drawable.ic_brunch),
     TISTORY("Tistory", R.drawable.ic_tistory),
     NOTION("Notion", R.drawable.ic_notion),

diff --git a/presentation/src/main/java/com/kusitms/presentation/ui/profile/edit/ProfileLink.kt b/presentation/src/main/java/com/kusitms/presentation/ui/profile/edit/ProfileLink.kt
@@ -249,23 +249,6 @@ fun LinkCheckBox(
 ) {
     var isOpenLinkBottomSheet by remember { mutableStateOf(false) }
 
-    if (isOpenLinkBottomSheet) {
-        LinkBottomSheet(
-            viewModel,
-            isOpenLinkBottomSheet,
-            linkItemIndex
-        ) { isSelected, selectedLinkType ->
-            isOpenLinkBottomSheet = isSelected
-            if (isSelected && selectedLinkType is LinkType) {
-                viewModel.updateLinkItem(
-                    linkItemIndex,
-                    selectedLinkType,
-                    viewModel.linkItems.value[linkItemIndex].linkUrl
-                )
-            }
-        }
-    }
-
     Row(
         modifier = Modifier
             .width(110.dp)
@@ -300,6 +283,23 @@ fun LinkCheckBox(
             )
         }
     }
+
+    if (isOpenLinkBottomSheet) {
+        LinkBottomSheet(
+            viewModel,
+            isOpenLinkBottomSheet,
+            linkItemIndex
+        ) { isSelected, selectedLinkType ->
+            isOpenLinkBottomSheet = isSelected
+            if (isSelected && selectedLinkType is LinkType) {
+                viewModel.updateLinkItem(
+                    linkItemIndex,
+                    selectedLinkType,
+                    viewModel.linkItems.value[linkItemIndex].linkUrl
+                )
+            }
+        }
+    }
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,3 +4,4 @@ data class LinkModel(
		val type: String = "",
		val link: String = ""
		)