[MERGE] #31 -> develop

[UI/#31] OurTodo / 완료, 미완료 투두리스트 구현

Author: Marchbreeze

app/src/main/AndroidManifest.xml

@@ -51,7 +51,6 @@
             android:exported="false"
             android:screenOrientation="portrait"/>
 
-
         <activity
             android:name="com.going.presentation.tendencytest.TendencyTestSplashActivity"
             android:exported="false"

domain/src/main/kotlin/com/going/domain/entity/response/TodoModel.kt

@@ -0,0 +1,8 @@
+package com.going.domain.entity.response
+
+data class TodoModel(
+    val todoId: Long,
+    val title: String,
+    val endDate: String,
+    val allocation: List<String>
+)

presentation/src/main/java/com/going/presentation/todo/name/TodoNameAdapter.kt

@@ -0,0 +1,29 @@
+package com.going.presentation.todo.name
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.ListAdapter
+import com.going.presentation.databinding.ItemTodoNameBinding
+import com.going.ui.extension.ItemDiffCallback
+
+class TodoNameAdapter(
+    private val isCompleted: Boolean
+) : ListAdapter<String, TodoNameViewHolder>(diffUtil) {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TodoNameViewHolder {
+        val binding: ItemTodoNameBinding =
+            ItemTodoNameBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return TodoNameViewHolder(binding, isCompleted)
+    }
+
+    override fun onBindViewHolder(holder: TodoNameViewHolder, position: Int) {
+        holder.onBind(getItem(position))
+    }
+
+    companion object {
+        private val diffUtil = ItemDiffCallback<String>(
+            onItemsTheSame = { old, new -> old.length == new.length },
+            onContentsTheSame = { old, new -> old == new },
+        )
+    }
+}

presentation/src/main/java/com/going/presentation/todo/name/TodoNameViewHolder.kt

@@ -0,0 +1,33 @@
+package com.going.presentation.todo.name
+
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.RecyclerView
+import com.going.presentation.R
+import com.going.presentation.databinding.ItemTodoNameBinding
+
+class TodoNameViewHolder(
+    val binding: ItemTodoNameBinding, private val isCompleted: Boolean
+) : RecyclerView.ViewHolder(binding.root) {
+
+    private val redColor = ContextCompat.getColor(binding.root.context, R.color.red_500)
+    private val grayColor = ContextCompat.getColor(binding.root.context, R.color.gray_400)
+    private val completedColor = ContextCompat.getColor(binding.root.context, R.color.gray_300)
+
+    fun onBind(item: String) {
+        binding.run {
+            tvTodoName.text = item
+            if (isCompleted) {
+                tvTodoName.setTextColor(completedColor)
+                tvTodoName.setBackgroundResource(R.drawable.shape_rect_2_gray300_line)
+            } else {
+                if (item == "김상호") {
+                    tvTodoName.setTextColor(redColor)
+                    tvTodoName.isSelected = true
+                } else {
+                    tvTodoName.setTextColor(grayColor)
+                }
+            }
+        }
+    }
+
+}

presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoFragment.kt

@@ -19,7 +19,7 @@ class OurTodoFragment() : BaseFragment<FragmentOurTodoBinding>(R.layout.fragment
 
     private val tabTextList = listOf(TAB_UNCOMPLETE, TAB_COMPLETE)
 
-    private var _adapter: OurTodoAdapter? = null
+    private var _adapter: OurTodoFriendAdapter? = null
     private val adapter
         get() = requireNotNull(_adapter) { getString(R.string.adapter_not_initialized_error_msg) }
 
@@ -36,7 +36,7 @@ class OurTodoFragment() : BaseFragment<FragmentOurTodoBinding>(R.layout.fragment
     }
 
     private fun initAdapter() {
-        _adapter = OurTodoAdapter()
+        _adapter = OurTodoFriendAdapter()
         binding.rvOurTripFriend.adapter = adapter
         adapter.submitList(viewModel.mockParticipantsList)
     }
@@ -56,7 +56,7 @@ class OurTodoFragment() : BaseFragment<FragmentOurTodoBinding>(R.layout.fragment
     }
 
     private fun setProgressBarStatus() {
-        binding.progressBarOurTodo.progress = 40
+        binding.progressBarOurTodo.progress = 62
     }
 
     private fun setTabLayout() {

…sentation/todo/ourtodo/OurTodoAdapter.kt …ion/todo/ourtodo/OurTodoFriendAdapter.ktpresentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoAdapter.kt renamed to presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoFriendAdapter.kt presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoAdapter.kt renamed to presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoFriendAdapter.kt

@@ -7,24 +7,18 @@ import com.going.domain.entity.response.TripParticipantsListModel.TripParticipan
 import com.going.presentation.databinding.ItemTodoFriendsBinding
 import com.going.ui.extension.ItemDiffCallback
 
-class OurTodoAdapter : ListAdapter<TripParticipantModel, OurTodoViewHolder>(diffUtil) {
+class OurTodoFriendAdapter : ListAdapter<TripParticipantModel, OurTodoFriendViewHolder>(diffUtil) {
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): OurTodoViewHolder {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): OurTodoFriendViewHolder {
         val binding: ItemTodoFriendsBinding =
             ItemTodoFriendsBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        return OurTodoViewHolder(binding)
+        return OurTodoFriendViewHolder(binding)
     }
 
-    override fun onBindViewHolder(holder: OurTodoViewHolder, position: Int) {
+    override fun onBindViewHolder(holder: OurTodoFriendViewHolder, position: Int) {
         holder.onBind(getItem(position))
     }
 
-    fun addList(newItems: List<TripParticipantModel>) {
-        val currentItems = currentList.toMutableList()
-        currentItems.addAll(newItems)
-        submitList(currentItems)
-    }
-
     companion object {
         private val diffUtil = ItemDiffCallback<TripParticipantModel>(
             onItemsTheSame = { old, new -> old.participantId == new.participantId },

…tation/todo/ourtodo/OurTodoViewHolder.kt …/todo/ourtodo/OurTodoFriendViewHolder.ktpresentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoViewHolder.kt renamed to presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoFriendViewHolder.kt presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoViewHolder.kt renamed to presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoFriendViewHolder.kt

@@ -7,7 +7,7 @@ import com.going.domain.entity.response.TripParticipantsListModel.TripParticipan
 import com.going.presentation.R
 import com.going.presentation.databinding.ItemTodoFriendsBinding
 
-class OurTodoViewHolder(val binding: ItemTodoFriendsBinding) : RecyclerView.ViewHolder(binding.root) {
+class OurTodoFriendViewHolder(val binding: ItemTodoFriendsBinding) : RecyclerView.ViewHolder(binding.root) {
 
     fun onBind(item: TripParticipantModel) {
         binding.run {

presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoViewModel.kt

@@ -1,6 +1,7 @@
 package com.going.presentation.todo.ourtodo
 
 import androidx.lifecycle.ViewModel
+import com.going.domain.entity.response.TodoModel
 import com.going.domain.entity.response.TripParticipantsListModel.TripParticipantModel
 
 // @HiltViewModel
@@ -15,4 +16,19 @@ class OurTodoViewModel : ViewModel() {
         TripParticipantModel(5, "육지민", 100),
         TripParticipantModel(6, "칠지민", 100)
     )
+
+    val mockUncompleteTodoList: List<TodoModel> = listOf(
+        TodoModel(0,"숙소 예약하기", "2024-01-12", listOf("김상호", "박동민")),
+        TodoModel(1,"기차 왕복 예약하기", "2024-01-14", listOf("조세연")),
+        TodoModel(2,"와사비맛 아몬드 먹기", "2024-01-15", listOf("이유빈", "김상호")),
+        TodoModel(3,"커피 사기", "2024-01-15", listOf("이유빈")),
+        TodoModel(4,"숙소 예약하기", "2024-01-12", listOf("김상호", "박동민")),
+        TodoModel(5,"기차 왕복 예약하기", "2024-01-14", listOf("조세연")),
+        TodoModel(6,"와사비맛 아몬드 먹기", "2024-01-15", listOf("이유빈", "김상호")),
+        TodoModel(7,"커피 사기", "2024-01-15", listOf("이유빈"))
+    )
+
+    val mockCompleteTodoList: List<TodoModel> = listOf(
+        TodoModel(0,"숙소 예약하기", "2024-01-12", listOf("김상호", "박동민")),
+    )
 }

presentation/src/main/java/com/going/presentation/todo/ourtodo/todolist/OurTodoCompleteFragment.kt

@@ -1,12 +1,39 @@
 package com.going.presentation.todo.ourtodo.todolist
 
+import android.os.Bundle
+import android.view.View
+import androidx.fragment.app.activityViewModels
 import com.going.presentation.R
 import com.going.presentation.databinding.FragmentOurTodoCompleteBinding
+import com.going.presentation.todo.ourtodo.OurTodoViewModel
 import com.going.ui.base.BaseFragment
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
 class OurTodoCompleteFragment() :
     BaseFragment<FragmentOurTodoCompleteBinding>(R.layout.fragment_our_todo_complete) {
 
+    private var _adapter: OurTodoListAdapter? = null
+    private val adapter
+        get() = requireNotNull(_adapter) { getString(R.string.adapter_not_initialized_error_msg) }
+
+    private val viewModel by activityViewModels<OurTodoViewModel>()
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        setRecyclerView()
+    }
+
+    private fun setRecyclerView() {
+        _adapter = OurTodoListAdapter(true)
+        binding.rvOurTodoComplete.adapter = adapter
+        adapter.submitList(viewModel.mockCompleteTodoList)
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _adapter = null
+    }
+
 }

presentation/src/main/java/com/going/presentation/todo/ourtodo/todolist/OurTodoListAdapter.kt

@@ -0,0 +1,30 @@
+package com.going.presentation.todo.ourtodo.todolist
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.ListAdapter
+import com.going.domain.entity.response.TodoModel
+import com.going.presentation.databinding.ItemOurTodoBinding
+import com.going.ui.extension.ItemDiffCallback
+
+class OurTodoListAdapter(
+    private val isCompleted: Boolean
+) : ListAdapter<TodoModel, OurTodoListViewHolder>(diffUtil) {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): OurTodoListViewHolder {
+        val binding: ItemOurTodoBinding =
+            ItemOurTodoBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return OurTodoListViewHolder(binding, isCompleted)
+    }
+
+    override fun onBindViewHolder(holder: OurTodoListViewHolder, position: Int) {
+        holder.onBind(getItem(position))
+    }
+
+    companion object {
+        private val diffUtil = ItemDiffCallback<TodoModel>(
+            onItemsTheSame = { old, new -> old.todoId == new.todoId },
+            onContentsTheSame = { old, new -> old == new },
+        )
+    }
+}