[feat] #178 recent saved link

core/designsystem/src/main/res/drawable/ic_arrow_black_svg.xml

@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="8dp"
+    android:height="14dp"
+    android:viewportWidth="8"
+    android:viewportHeight="14">
+  <path
+      android:pathData="M0.999,12.833L6.832,7L0.999,1.166"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#191919"
+      android:strokeLineCap="round"/>
+</vector>

core/designsystem/src/main/res/values/strings.xml

@@ -152,9 +152,11 @@
   <string name="home_unforget_read">잊지 않고 읽었어요!</string>
   <string name="home_toast_progress_link">nn</string>
   <string name="home_all_toast_ex_num">/nn</string>
-  <string name="home_user_clip">님의 클립</string>
+  <string name="home_user_clip">님이 최근 저장한 링크</string>
   <string name="home_this_week_link">이주의 링크</string>
   <string name="home_this_week_recommend">이주의 추천 사이트</string>
+  <string name="home_item_link_empty">첫번째 링크를 저장해보세요</string>
+
   <string name="home_survey_title">1분 설문조사 참여하고\n스타벅스 기프티콘 받기</string>
   <string name="home_survey_subtitle">토스터 사용 피드백을 남겨주시면\n추첨을 통해 기프티콘을 드려요!</string>
   <string name="home_survey_button">참여하기</string>

core/model/src/main/java/org/sopt/model/home/RecentSavedLink.kt

@@ -0,0 +1,10 @@
+package org.sopt.model.home
+
+data class RecentSavedLink(
+  val toastId: Long,
+  val toastTitle: String,
+  val linkUrl: String,
+  val isRead: Boolean,
+  val categoryTitle: String?,
+  val thumbnailUrl: String?,
+)

data-remote/home/src/main/java/org/sopt/remote/home/api/HomeService.kt

@@ -2,6 +2,7 @@ package org.sopt.remote.home.api
 
 import org.sopt.network.model.response.base.BaseResponse
 import org.sopt.remote.home.response.ResponseMainPageDto
+import org.sopt.remote.home.response.ResponseRecentSavedLinkDto
 import org.sopt.remote.home.response.ResponseRecommendLinkDto
 import org.sopt.remote.home.response.ResponseWeekBestLinkDto
 import retrofit2.http.GET
@@ -13,6 +14,7 @@ interface HomeService {
     const val SITES = "sites"
     const val TOAST = "toast"
     const val WEEK = "week"
+    const val RECENT_SAVED = "recent-saved"
   }
 
   @GET("/$USER/$MAIN")
@@ -23,4 +25,7 @@ interface HomeService {
 
   @GET("/$TOAST/$WEEK")
   suspend fun getWeekBestLink(): BaseResponse<List<ResponseWeekBestLinkDto>>
+
+  @GET("/$TOAST/$RECENT_SAVED")
+  suspend fun getRecentSavedLink(): BaseResponse<List<ResponseRecentSavedLinkDto>>
 }

data-remote/home/src/main/java/org/sopt/remote/home/datasource/RemoteHomeDataSourceImpl.kt

@@ -2,6 +2,7 @@ package org.sopt.remote.home.datasource
 
 import org.sopt.home.datasource.RemoteHomeDataSource
 import org.sopt.model.home.MainPageData
+import org.sopt.model.home.RecentSavedLink
 import org.sopt.model.home.RecommendLink
 import org.sopt.model.home.WeekBestLink
 import org.sopt.remote.home.api.HomeService
@@ -19,4 +20,7 @@ class RemoteHomeDataSourceImpl @Inject constructor(
 
   override suspend fun getWeekBestLink(): List<WeekBestLink> =
     homeService.getWeekBestLink().data!!.map { it.toCoreModel() }
+
+  override suspend fun getRecentSavedLink(): List<RecentSavedLink> =
+    homeService.getRecentSavedLink().data!!.map { it.toCoreModel() }
 }

data-remote/home/src/main/java/org/sopt/remote/home/response/ResponseRecentSavedLinkDto.kt

@@ -0,0 +1,30 @@
+package org.sopt.remote.home.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import org.sopt.model.home.RecentSavedLink
+
+@Serializable
+data class ResponseRecentSavedLinkDto(
+  @SerialName("toastId")
+  val toastId: Long,
+  @SerialName("toastTitle")
+  val toastTitle: String,
+  @SerialName("linkUrl")
+  val linkUrl: String,
+  @SerialName("isRead")
+  val isRead: Boolean,
+  @SerialName("categoryTitle")
+  val categoryTitle: String?,
+  @SerialName("thumbnailUrl")
+  val thumbnailUrl: String?,
+)
+
+internal fun ResponseRecentSavedLinkDto.toCoreModel() = RecentSavedLink(
+  toastId = toastId,
+  toastTitle = toastTitle,
+  linkUrl = linkUrl,
+  isRead = isRead,
+  categoryTitle = categoryTitle,
+  thumbnailUrl = thumbnailUrl,
+)

data/home/src/main/java/org/sopt/home/datasource/RemoteHomeDataSource.kt

@@ -1,11 +1,13 @@
 package org.sopt.home.datasource
 
 import org.sopt.model.home.MainPageData
+import org.sopt.model.home.RecentSavedLink
 import org.sopt.model.home.RecommendLink
 import org.sopt.model.home.WeekBestLink
 
 interface RemoteHomeDataSource {
   suspend fun getMainPageUserClip(): MainPageData
   suspend fun getRecommendSite(): List<RecommendLink>
   suspend fun getWeekBestLink(): List<WeekBestLink>
+  suspend fun getRecentSavedLink(): List<RecentSavedLink>
 }

data/home/src/main/java/org/sopt/home/repository/HomeRepoImpl.kt

@@ -2,6 +2,7 @@ package org.sopt.home.repository
 
 import org.sopt.home.datasource.RemoteHomeDataSource
 import org.sopt.model.home.MainPageData
+import org.sopt.model.home.RecentSavedLink
 import org.sopt.model.home.RecommendLink
 import org.sopt.model.home.WeekBestLink
 import javax.inject.Inject
@@ -17,4 +18,7 @@ class HomeRepoImpl @Inject constructor(
 
   override suspend fun getWeekBestLink(): Result<List<WeekBestLink>> =
     runCatching { remoteHomeDataSource.getWeekBestLink() }
+
+  override suspend fun getRecentSavedLink(): Result<List<RecentSavedLink>> =
+    runCatching { remoteHomeDataSource.getRecentSavedLink() }
 }

domain/home/src/main/java/org/sopt/home/repository/HomeRepository.kt

@@ -1,11 +1,13 @@
 package org.sopt.home.repository
 
 import org.sopt.model.home.MainPageData
+import org.sopt.model.home.RecentSavedLink
 import org.sopt.model.home.RecommendLink
 import org.sopt.model.home.WeekBestLink
 
 interface HomeRepository {
   suspend fun getMainPageUserClip(): Result<MainPageData>
   suspend fun getRecommendSite(): Result<List<RecommendLink>>
   suspend fun getWeekBestLink(): Result<List<WeekBestLink>>
+  suspend fun getRecentSavedLink(): Result<List<RecentSavedLink>>
 }

domain/home/src/main/java/org/sopt/home/usecase/GetRecentSavedLink.kt

@@ -0,0 +1,11 @@
+package org.sopt.home.usecase
+
+import org.sopt.home.repository.HomeRepository
+import org.sopt.model.home.RecentSavedLink
+import javax.inject.Inject
+
+class GetRecentSavedLink @Inject constructor(
+  private val homeRepository: HomeRepository,
+) {
+  suspend operator fun invoke(): Result<List<RecentSavedLink>> = homeRepository.getRecentSavedLink()
+}

feature/home/src/main/java/org/sopt/home/HomeContract.kt

@@ -3,6 +3,7 @@ package org.sopt.home
 import org.sopt.home.model.UpdatePriority
 import org.sopt.model.category.Category
 import org.sopt.model.home.PopupInfo
+import org.sopt.model.home.RecentSavedLink
 import org.sopt.model.home.RecommendLink
 import org.sopt.model.home.WeekBestLink
 
@@ -13,6 +14,7 @@ data class HomeState(
   val categoryList: List<Category?> = emptyList(),
   val weekBestLink: List<WeekBestLink> = emptyList(),
   val recommendLink: List<RecommendLink> = emptyList(),
+  val recentSavedLink: List<RecentSavedLink?> = emptyList(),
   val url: String = "",
   val categoryId: Long? = 0,
   val categoryName: String? = "전체 클립",
@@ -33,8 +35,9 @@ sealed interface HomeSideEffect {
   data object NavigateSetting : HomeSideEffect
   data object NavigateSearch : HomeSideEffect
   data object NavigateClipLink : HomeSideEffect
+  data object NavigateAllClip : HomeSideEffect
   data object NavigateWebView : HomeSideEffect
-  data object ShowBottomSheet : HomeSideEffect
   data object ShowPopupInfo : HomeSideEffect
   data object ShowUpdateDialog : HomeSideEffect
+  data object NavigateSaveLink : HomeSideEffect
 }

feature/home/src/main/java/org/sopt/home/HomeFragment.kt

@@ -5,8 +5,6 @@ import android.view.View
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import dagger.hilt.android.AndroidEntryPoint
-import designsystem.components.bottomsheet.LinkMindBottomSheet
-import designsystem.components.toast.linkMindSnackBar
 import org.orbitmvi.orbit.viewmodel.observe
 import org.sopt.common.util.delSpace
 import org.sopt.home.adapter.HomeClipAdapter
@@ -36,6 +34,7 @@ class HomeFragment : BindingFragment<FragmentHomeBinding>({ FragmentHomeBinding.
     collectState()
     navigateToSetting()
     navigateToSearch()
+    navigateToAllClip()
   }
 
   private fun initView() {
@@ -53,7 +52,7 @@ class HomeFragment : BindingFragment<FragmentHomeBinding>({ FragmentHomeBinding.
     binding.tvHomeUserClipName.text = homeState.nickName
     binding.tvHomeToastLinkCount.text = "${homeState.readToastNum}개의 링크"
     binding.pbLinkmindHome.setProgressBarMain(homeState.calculateProgress())
-    homeClipAdapter.submitList(homeState.categoryList)
+    homeClipAdapter.submitList(homeState.recentSavedLink)
     homeWeekLinkAdapter.submitList(homeState.weekBestLink)
     homeWeekRecommendLinkAdapter.submitList(homeState.recommendLink)
   }
@@ -65,15 +64,14 @@ class HomeFragment : BindingFragment<FragmentHomeBinding>({ FragmentHomeBinding.
       is HomeSideEffect.NavigateClipLink -> navigateToDestination(
         "featureSaveLink://ClipLinkFragment/${viewModel.container.stateFlow.value.categoryId}/${viewModel.container.stateFlow.value.categoryName}",
       )
-
-      is HomeSideEffect.ShowBottomSheet -> showHomeBottomSheet()
+      is HomeSideEffect.NavigateSaveLink -> navigateToDestinationWithoutAnim("featureSaveLink://saveLinkFragment?clipboardLink=")
       is HomeSideEffect.NavigateWebView -> {
         val encodedURL = URLEncoder.encode(viewModel.container.stateFlow.value.url, StandardCharsets.UTF_8.toString())
         navigateToDestination(
           "featureSaveLink://webViewFragment/${0}/${false}/${false}/$encodedURL",
         )
       }
-
+      is HomeSideEffect.NavigateAllClip -> navigateToDestinationWithoutAnim("featureSaveLink://ClipLinkFragment/0/전체 클립")
       is HomeSideEffect.ShowPopupInfo -> showPopupInfo(viewModel.container.stateFlow.value.popupList)
       is HomeSideEffect.ShowUpdateDialog -> showUpdateDialog(viewModel.container.stateFlow.value.marketUpdate)
     }
@@ -86,6 +84,7 @@ class HomeFragment : BindingFragment<FragmentHomeBinding>({ FragmentHomeBinding.
     viewModel.apply {
       getMainPageUserClip()
       getRecommendSite()
+      getRecentSavedClip()
       getWeekBestLink()
       getPopupListInfo()
       checkMarketUpdateState()
@@ -104,18 +103,22 @@ class HomeFragment : BindingFragment<FragmentHomeBinding>({ FragmentHomeBinding.
     }
   }
 
+  private fun navigateToAllClip() {
+    binding.ivRecentClip.onThrottleClick {
+      viewModel.navigateAllClip()
+    }
+  }
+
   private fun setClipAdapter() {
     homeClipAdapter = HomeClipAdapter(
       onClickClip = {
-        viewModel.navigateClipLink(it.categoryId, it.categoryTitle)
+        viewModel.navigateWebview(it.linkUrl)
       },
       onClickEmptyClip = {
-        viewModel.showBottomSheet()
+        viewModel.navigateSaveLink()
       },
     )
     binding.rvHomeClip.adapter = homeClipAdapter
-    val spacingClipInPixels = resources.getDimensionPixelSize(R.dimen.spacing_11)
-    binding.rvHomeClip.addItemDecoration(ItemDecoration(2, spacingClipInPixels))
   }
 
   private fun setWeekLinkAdapter() {
@@ -149,20 +152,11 @@ class HomeFragment : BindingFragment<FragmentHomeBinding>({ FragmentHomeBinding.
     findNavController().navigate(request, navOptions)
   }
 
-  private fun showHomeBottomSheet() {
-    val linkMindBottomSheet = LinkMindBottomSheet(requireContext())
-    linkMindBottomSheet.show()
-    linkMindBottomSheet.apply {
-      setBottomSheetHint(org.sopt.mainfeature.R.string.home_new_clip_info)
-      setTitle(org.sopt.mainfeature.R.string.home_add_clip)
-      setErroMsg(org.sopt.mainfeature.R.string.home_error_clip_info)
-      bottomSheetConfirmBtnClick {
-        if (showErrorMsg()) return@bottomSheetConfirmBtnClick
-        viewModel.saveCategoryTitle(it)
-        dismiss()
-        requireContext().linkMindSnackBar(binding.vSnack, "클립 생성 완료!", false)
-      }
-    }
+  private fun navigateToDestinationWithoutAnim(destination: String) {
+    val (request, navOptions) = DeepLinkUtil.getNavRequestNotPopUpAndOption(
+      destination.delSpace(),
+    )
+    findNavController().navigate(request, navOptions)
   }
 
   private fun showPopupInfo(popupList: List<PopupInfo>) {

feature/home/src/main/java/org/sopt/home/HomeViewModel.kt

@@ -23,10 +23,10 @@ import org.sopt.domain.category.category.usecase.PostAddCategoryTitleUseCase
 import org.sopt.home.model.UpdatePriority
 import org.sopt.home.usecase.GetMainPageUserClip
 import org.sopt.home.usecase.GetPopupInfo
+import org.sopt.home.usecase.GetRecentSavedLink
 import org.sopt.home.usecase.GetRecommendSite
 import org.sopt.home.usecase.GetWeekBestLink
 import org.sopt.home.usecase.PatchPopupInvisible
-import org.sopt.model.category.Category
 import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Locale
@@ -38,6 +38,7 @@ class HomeViewModel @Inject constructor(
   private val getMainPageUserClip: GetMainPageUserClip,
   private val getRecommendSite: GetRecommendSite,
   private val getWeekBestLink: GetWeekBestLink,
+  private val getRecentSavedLink: GetRecentSavedLink,
   private val postAddCategoryTitle: PostAddCategoryTitleUseCase,
   private val patchPopupInvisible: PatchPopupInvisible,
   private val getPopupInfo: GetPopupInfo,
@@ -46,42 +47,36 @@ class HomeViewModel @Inject constructor(
   override val container: Container<HomeState, HomeSideEffect> =
     container(HomeState())
 
-  fun saveCategoryTitle(categoryTitle: String) = viewModelScope.launch {
-    postAddCategoryTitle(
-      PostAddCategoryTitleUseCase.Param(
-        categoryTitle = categoryTitle,
-      ),
-    ).onSuccess {
-      getMainPageUserClip()
-    }.onFailure { Log.d("saveCategoryTitleFail", "$it") }
-  }
-
   fun getMainPageUserClip() = intent {
     getMainPageUserClip.invoke().onSuccess {
       reduce {
-        val tempCategoryList = listOf(
-          Category(
-            0,
-            "전체 카테고리",
-            it.allToastNum.toLong(),
-          ),
-        ) + it.mainCategoryDto
-        val categoryList = if (tempCategoryList.size < 4) tempCategoryList + null else tempCategoryList
-        val finalCategoryList = categoryList.distinctBy { it?.categoryId }
         state.copy(
           nickName = it.nickName,
           allToastNum = it.allToastNum,
           readToastNum = it.readToastNum,
-          categoryList = (
-            finalCategoryList
-            ),
         )
       }
     }.onFailure {
       Log.d("MainUser", "$it")
     }
   }
 
+  fun getRecentSavedClip() = intent {
+    getRecentSavedLink.invoke().onSuccess {
+      if (it.isEmpty()) {
+        reduce {
+          state.copy(recentSavedLink = listOf(null))
+        }
+      } else {
+        reduce {
+          state.copy(recentSavedLink = (container.stateFlow.value.recentSavedLink + it).distinctBy { it?.toastId })
+        }
+      }
+    }.onFailure {
+      Log.d("RecentSaved", "$it")
+    }
+  }
+
   fun getRecommendSite() = intent {
     getRecommendSite.invoke().onSuccess {
       reduce {
@@ -151,18 +146,8 @@ class HomeViewModel @Inject constructor(
 
   fun navigateSearch() = intent { postSideEffect(HomeSideEffect.NavigateSearch) }
   fun navigateSetting() = intent { postSideEffect(HomeSideEffect.NavigateSetting) }
-  fun showBottomSheet() = intent { postSideEffect(HomeSideEffect.ShowBottomSheet) }
-
-  @OptIn(OrbitExperimental::class)
-  fun navigateClipLink(categoryId: Long?, categoryName: String?) = blockingIntent {
-    reduce {
-      state.copy(
-        categoryId = categoryId,
-        categoryName = categoryName,
-      )
-    }
-    postSideEffect(HomeSideEffect.NavigateClipLink)
-  }
+  fun navigateSaveLink() = intent { postSideEffect(HomeSideEffect.NavigateSaveLink) }
+  fun navigateAllClip() = intent { postSideEffect(HomeSideEffect.NavigateAllClip) }
 
   @OptIn(OrbitExperimental::class)
   fun navigateWebview(url: String) = blockingIntent {