#54 [ui] 행복루틴 삭제하기 뷰

app/src/main/java/com/sopetit/softie/data/entity/response/HappyChipResponse.kt

@@ -0,0 +1,25 @@
+package com.sopetit.softie.data.entity.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class HappyChipResponse(
+    @SerialName("themes")
+    val themes: List<HappyChip>
+) {
+    @Serializable
+    data class HappyChip(
+        @SerialName("themeId")
+        val themeId: Int,
+        @SerialName("name")
+        val name: String,
+    )
+
+    fun toHappyChip() = themes.map { happychip ->
+        com.sopetit.softie.domain.entity.HappyChip(
+            themeId = happychip.themeId,
+            name = happychip.name,
+        )
+    }
+}

app/src/main/java/com/sopetit/softie/data/entity/response/HappyContentResponse.kt

@@ -0,0 +1,34 @@
+package com.sopetit.softie.data.entity.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class HappyContentResponse(
+    @SerialName("routines")
+    val routines: List<HappyContent>
+) {
+    @Serializable
+    data class HappyContent(
+        @SerialName("routineId")
+        val routineId: Int,
+        @SerialName("name")
+        val name: String,
+        @SerialName("nameColor")
+        val nameColor: String,
+        @SerialName("title")
+        val title: String,
+        @SerialName("iconImageUrl")
+        val iconImageUrl: String
+    )
+
+    fun toHappyContent() = routines.map { happycontent ->
+        com.sopetit.softie.domain.entity.HappyContent(
+            routineId = happycontent.routineId,
+            name = happycontent.name,
+            nameColor = happycontent.nameColor,
+            title = happycontent.title,
+            iconImageUrl = happycontent.iconImageUrl
+        )
+    }
+}

app/src/main/java/com/sopetit/softie/data/repositoryImpl/HappinessRoutineRepositoryImpl.kt

@@ -0,0 +1,21 @@
+package com.sopetit.softie.data.repositoryImpl
+
+import com.sopetit.softie.data.source.HappinessRoutineDataSource
+import com.sopetit.softie.domain.entity.HappyChip
+import com.sopetit.softie.domain.entity.HappyContent
+import com.sopetit.softie.domain.repository.HappinessRoutineRepository
+import javax.inject.Inject
+
+class HappinessRoutineRepositoryImpl @Inject constructor(
+    private val happinessRoutineDataSource: HappinessRoutineDataSource
+) : HappinessRoutineRepository {
+    override suspend fun getHappyChip(): Result<List<HappyChip>> =
+        runCatching { happinessRoutineDataSource.getHappyChip() }.map { response ->
+            requireNotNull(response.data).toHappyChip()
+        }
+
+    override suspend fun getHappyContent(themeId: Int): Result<List<HappyContent>> =
+        runCatching { happinessRoutineDataSource.getHappyContent(themeId) }.map { response ->
+            requireNotNull(response.data).toHappyContent()
+        }
+}

app/src/main/java/com/sopetit/softie/data/service/HappinessRoutineService.kt

@@ -0,0 +1,17 @@
+package com.sopetit.softie.data.service
+
+import com.sopetit.softie.data.entity.BaseResponse
+import com.sopetit.softie.data.entity.response.HappyChipResponse
+import com.sopetit.softie.data.entity.response.HappyContentResponse
+import retrofit2.http.GET
+import retrofit2.http.Query
+
+interface HappinessRoutineService {
+    @GET("api/v1/routines/happiness/themes")
+    suspend fun getHappyChip(): BaseResponse<HappyChipResponse>
+
+    @GET("api/v1/routines/happiness")
+    suspend fun getHappyContent(
+        @Query("themeId") themeId: Int
+    ): BaseResponse<HappyContentResponse>
+}

app/src/main/java/com/sopetit/softie/data/source/HappinessRoutineDataSource.kt

@@ -0,0 +1,17 @@
+package com.sopetit.softie.data.source
+
+import com.sopetit.softie.data.entity.BaseResponse
+import com.sopetit.softie.data.entity.response.HappyChipResponse
+import com.sopetit.softie.data.entity.response.HappyContentResponse
+import com.sopetit.softie.data.service.HappinessRoutineService
+import javax.inject.Inject
+
+class HappinessRoutineDataSource @Inject constructor(
+    private val happinessRoutineService: HappinessRoutineService
+) {
+    suspend fun getHappyChip(): BaseResponse<HappyChipResponse> =
+        happinessRoutineService.getHappyChip()
+
+    suspend fun getHappyContent(themeId: Int): BaseResponse<HappyContentResponse> =
+        happinessRoutineService.getHappyContent(themeId)
+}

app/src/main/java/com/sopetit/softie/di/RepositoryModule.kt

@@ -2,9 +2,11 @@ package com.sopetit.softie.di
 
 import com.sopetit.softie.data.repositoryImpl.DailyRoutineRepositoryImpl
 import com.sopetit.softie.data.repositoryImpl.DollRepositoryImpl
+import com.sopetit.softie.data.repositoryImpl.HappinessRoutineRepositoryImpl
 import com.sopetit.softie.data.repositoryImpl.MemberRepositoryImpl
 import com.sopetit.softie.domain.repository.DailyRoutineRepository
 import com.sopetit.softie.domain.repository.DollRepository
+import com.sopetit.softie.domain.repository.HappinessRoutineRepository
 import com.sopetit.softie.domain.repository.MemberRepository
 import dagger.Binds
 import dagger.Module
@@ -32,4 +34,10 @@ abstract class RepositoryModule {
     abstract fun bindToDollRepository(
         dollRepositoryImpl: DollRepositoryImpl
     ): DollRepository
+
+    @Binds
+    @Singleton
+    abstract fun bindToHappinessRoutineRepository(
+        happinessRoutineRepositoryImpl: HappinessRoutineRepositoryImpl
+    ): HappinessRoutineRepository
 }

app/src/main/java/com/sopetit/softie/di/RetrofitServiceModule.kt

@@ -2,6 +2,7 @@ package com.sopetit.softie.di
 
 import com.sopetit.softie.data.service.DailyRoutineService
 import com.sopetit.softie.data.service.DollService
+import com.sopetit.softie.data.service.HappinessRoutineService
 import com.sopetit.softie.data.service.MemberService
 import dagger.Module
 import dagger.Provides
@@ -23,4 +24,8 @@ object RetrofitServiceModule {
     @Provides
     fun providesDollService(@RetrofitModule.SoftieType retrofit: Retrofit): DollService =
         retrofit.create(DollService::class.java)
+
+    @Provides
+    fun providesHappinessRoutineService(@RetrofitModule.SoftieType retrofit: Retrofit): HappinessRoutineService =
+        retrofit.create(HappinessRoutineService::class.java)
 }

app/src/main/java/com/sopetit/softie/domain/entity/HappyContent.kt

@@ -1,10 +1,9 @@
 package com.sopetit.softie.domain.entity
 
-import androidx.annotation.DrawableRes
-
 data class HappyContent(
     val routineId: Int,
+    val name: String,
+    val nameColor: String,
     val title: String,
-    val content: String,
-    @DrawableRes val imageUrl: Int,
+    val iconImageUrl: String,
 )

app/src/main/java/com/sopetit/softie/domain/entity/HappyUser.kt

@@ -0,0 +1,14 @@
+package com.sopetit.softie.domain.entity
+
+import androidx.annotation.DrawableRes
+
+data class HappyUser(
+    val routineId: Int,
+    @DrawableRes val imageUrl: Int,
+    val title: String,
+    val content: String,
+    val detailTitle: String,
+    val detailContent: String,
+    val detailTime: String,
+    val detailPlace: String
+)

app/src/main/java/com/sopetit/softie/domain/repository/HappinessRoutineRepository.kt

@@ -0,0 +1,9 @@
+package com.sopetit.softie.domain.repository
+
+import com.sopetit.softie.domain.entity.HappyChip
+import com.sopetit.softie.domain.entity.HappyContent
+
+interface HappinessRoutineRepository {
+    suspend fun getHappyChip(): Result<List<HappyChip>>
+    suspend fun getHappyContent(themeId: Int): Result<List<HappyContent>>
+}

app/src/main/java/com/sopetit/softie/domain/usecase/GetHappyChipUseCase.kt

@@ -0,0 +1,10 @@
+package com.sopetit.softie.domain.usecase
+
+import com.sopetit.softie.domain.repository.HappinessRoutineRepository
+import javax.inject.Inject
+
+class GetHappyChipUseCase @Inject constructor(
+    private val happinessRoutineRepository: HappinessRoutineRepository
+) {
+    suspend operator fun invoke() = happinessRoutineRepository.getHappyChip()
+}

app/src/main/java/com/sopetit/softie/domain/usecase/GetHappyContentUseCase.kt

@@ -0,0 +1,11 @@
+package com.sopetit.softie.domain.usecase
+
+import com.sopetit.softie.domain.repository.HappinessRoutineRepository
+import javax.inject.Inject
+
+class GetHappyContentUseCase @Inject constructor(
+    private val happinessRoutineRepository: HappinessRoutineRepository
+) {
+    suspend operator fun invoke(themeId: Int) =
+        happinessRoutineRepository.getHappyContent(themeId)
+}

app/src/main/java/com/sopetit/softie/ui/happyroutine/addlist/HappyAddListActivity.kt

@@ -6,7 +6,6 @@ import androidx.activity.viewModels
 import androidx.recyclerview.widget.RecyclerView
 import com.sopetit.softie.R
 import com.sopetit.softie.databinding.ActivityHappyAddListBinding
-import com.sopetit.softie.domain.entity.HappyContent
 import com.sopetit.softie.ui.happyroutine.adddetail.HappyDetailActivity
 import com.sopetit.softie.util.HorizontalChipItemDecoration
 import com.sopetit.softie.util.VerticalItemDecoration
@@ -25,18 +24,18 @@ class HappyAddListActivity :
     private var happyAddListChipContentAdapter: HappyAddListChipContentAdapter? = null
     private var happyAddListContentAdapter: HappyAddListContentAdapter? = null
 
-    private val themeId = 0
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityHappyAddListBinding.inflate(layoutInflater)
         setContentView(binding.root)
         setStatusBarColorFromResource(R.color.background)
 
+        viewModel.getHappyChip()
+
         setChipAdapters()
         setBackEnter()
         setItemDeco()
-        setupAdapter(themeId)
+        setupAdapter()
     }
 
     private fun setChipAdapters() {
@@ -57,33 +56,20 @@ class HappyAddListActivity :
         binding.rvHappyAddListChip.addItemDecoration(chipDeco)
     }
 
-    private fun setupAdapter(themeId: Int) {
+    private fun setupAdapter() {
         with(binding) {
             rvHappyAddListChip.adapter = happyAddListChipContentAdapter
             rvHappyAddList.adapter = happyAddListContentAdapter
         }
-        happyAddListChipContentAdapter?.submitList(viewModel.mockHappyChipList.value)
-        happyAddListContentAdapter?.submitList(viewModel.mockHappyContentList.value)
-
-        happyAddListChipContentAdapter?.setOnChipClickListener { handleChipClick(it.themeId) }
-    }
-
-    private fun handleChipClick(themeId: Int) {
-        val listToSubmit = when (themeId) {
-            1 -> viewModel.mockHappyContentList.value
-            2 -> viewModel.mockHappyContentListOne.value
-            3 -> viewModel.mockHappyContentListTwo.value
-            4 -> viewModel.mockHappyContentListThree.value
-            5 -> viewModel.mockHappyContentListFour.value
-            6 -> viewModel.mockHappyContentListFive.value
-            else -> viewModel.mockHappyContentList.value
+        viewModel.happyChipResponse.observe(this) {
+            happyAddListChipContentAdapter?.submitList(viewModel.happyChipResponse.value)
+        }
+        viewModel.happyContentResponse.observe(this) {
+            happyAddListContentAdapter?.submitList(viewModel.happyContentResponse.value)
+        }
+        happyAddListChipContentAdapter?.setOnChipClickListener {
+            viewModel.getHappyContent(it.themeId)
         }
-
-        listToSubmit?.let { makeSubmitList(it) }
-    }
-
-    private fun makeSubmitList(list: List<HappyContent>) {
-        happyAddListContentAdapter?.submitList(list)
     }
 
     private fun moveToDetail(id: Int) {

app/src/main/java/com/sopetit/softie/ui/happyroutine/addlist/HappyAddListContentAdapter.kt

@@ -1,9 +1,11 @@
 package com.sopetit.softie.ui.happyroutine.addlist
 
+import android.graphics.Color
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
+import coil.load
 import com.sopetit.softie.databinding.ItemHappyAddListBinding
 import com.sopetit.softie.domain.entity.HappyContent
 import com.sopetit.softie.util.ItemDiffCallback
@@ -22,9 +24,10 @@ class HappyAddListContentAdapter(private val moveToDetail: (Int) -> Unit) :
     ) :
         RecyclerView.ViewHolder(binding.root) {
         fun onBind(data: HappyContent) {
-            binding.tvHappyListItemTitle.text = data.title
-            binding.tvHappyListItemContent.text = data.content
-            binding.ivHappyListItemIcon.setImageResource(data.imageUrl)
+            binding.tvHappyListItemTitle.text = data.name
+            binding.tvHappyListItemTitle.setTextColor(Color.parseColor(data.nameColor))
+            binding.tvHappyListItemContent.text = data.title
+            binding.ivHappyListItemIcon.load(data.iconImageUrl)
 
             binding.root.setOnClickListener {
                 moveToDetail(data.routineId)