Merge branch 'dev' of https://github.com/nbCamp-24-02-19/CoLink into …

…feature/search/data

app/src/main/java/com/seven/colink/data/firebase/repository/GroupRepositoryImpl.kt

@@ -28,4 +28,13 @@ class GroupRepositoryImpl @Inject constructor(
         firestore.collection(DataBaseType.GROUP.title).document(key).get().await()
             .toObject(GroupEntity::class.java)
     }
+
+    override suspend fun getGroupByContainUserId(userId: String) = runCatching {
+        firestore.collection(DataBaseType.GROUP.title)
+            .whereArrayContains("memberIds", userId)
+            .get().await()
+            .documents.mapNotNull {
+                it.toObject(GroupEntity::class.java)
+            }
+    }
 }

app/src/main/java/com/seven/colink/domain/repository/GroupRepository.kt

@@ -1,10 +1,13 @@
 package com.seven.colink.domain.repository
 
 import com.seven.colink.domain.entity.GroupEntity
+import com.seven.colink.domain.entity.PostEntity
 import com.seven.colink.util.status.DataResultStatus
 
 interface GroupRepository {
 
     suspend fun registerGroup(group: GroupEntity): DataResultStatus
     suspend fun getGroupDetail(key: String): Result<GroupEntity?>
+
+    suspend fun getGroupByContainUserId(userId: String): Result<List<GroupEntity>>
 }

app/src/main/java/com/seven/colink/ui/group/GroupAdapter.kt

@@ -1,129 +1,183 @@
 package com.seven.colink.ui.group
 
+import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
+import coil.load
 import com.seven.colink.R
 import com.seven.colink.databinding.ItemGroupGroupAddBinding
 import com.seven.colink.databinding.ItemGroupGroupListBinding
 import com.seven.colink.databinding.ItemGroupTitleBinding
 import com.seven.colink.databinding.ItemHomeBottomBinding
+import com.seven.colink.databinding.ItemUnknownBinding
+import com.seven.colink.util.status.GroupType
+import com.seven.colink.util.status.GroupViewType
+import com.seven.colink.ui.group.GroupData
+import com.seven.colink.util.convert.convertToDaysAgo
 
-class GroupAdapter(private val mItems: MutableList<GroupData>): RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+class GroupAdapter(
+    private val context: Context,
+    private val onClickItem: (Int, GroupData) -> Unit,
+    private val onClickAddButton: (Int, GroupData) -> Unit,
+) : ListAdapter<GroupData, GroupAdapter.GroupViewHolder>(
+    object : DiffUtil.ItemCallback<GroupData>() {
 
-    interface JoinItemClick {
-        fun onClick(item: GroupData.GroupList, position: Int)
-    }
-    var joinItemClick: JoinItemClick? = null
+        override fun areItemsTheSame(oldItem: GroupData, newItem: GroupData): Boolean =
+            when {
+                oldItem is GroupData.GroupTitle && newItem is GroupData.GroupTitle -> {
+                    oldItem.title == newItem.title
+                }
 
-    interface AddItemClick {
-        fun onClick(view: View, position: Int)
-    }
-    var addItemClick: AddItemClick? = null
+                oldItem is GroupData.GroupList && newItem is GroupData.GroupList -> {
+                    oldItem.projectName == newItem.projectName
+                }
+
+                oldItem is GroupData.GroupAdd && newItem is GroupData.GroupAdd -> {
+                    oldItem.addGroupText == newItem.addGroupText
+                }
+
+                oldItem is GroupData.GroupWant && newItem is GroupData.GroupWant -> {
+                    oldItem.description == newItem.description
+                }
+
+                else -> oldItem == newItem
+            }
 
-    interface WantItemClick {
-        fun onClick(item: GroupData.GroupWant, position: Int)
+        override fun areContentsTheSame(
+            oldItem: GroupData,
+            newItem: GroupData
+        ): Boolean = oldItem == newItem
     }
-    var wantItemClick: WantItemClick? = null
+) {
 
-    companion object{
-        private const val VIEW_TYPE_TITLE = 1
-        private const val VIEW_TYPE_LIST = 2
-        private const val VIEW_TYPE_ADD = 3
-        private const val VIEW_TYPE_WANT = 4
+    abstract class GroupViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+        abstract fun onBind(item: GroupData)
     }
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        return when(viewType){
-            VIEW_TYPE_TITLE -> {
-                val binding = ItemGroupTitleBinding.inflate(LayoutInflater.from(parent.context),parent,false)
-                TitleViewHolder(binding)
-            } VIEW_TYPE_LIST -> {
-                val binding = ItemGroupGroupListBinding.inflate(LayoutInflater.from(parent.context),parent,false)
-                ListViewHolder(binding)
-            }
-             VIEW_TYPE_WANT -> {
-                 val binding = ItemHomeBottomBinding.inflate(LayoutInflater.from(parent.context),parent,false)
-                 WantViewHolder(binding)
-             }
-            else -> {
-                val binding = ItemGroupGroupAddBinding.inflate(LayoutInflater.from(parent.context),parent,false)
-                AddViewHolder(binding)
-            }
+
+    override fun getItemViewType(position: Int): Int = when (getItem(position)) {
+        is GroupData.GroupTitle -> GroupViewType.TITLE
+        is GroupData.GroupList -> GroupViewType.LIST
+        is GroupData.GroupAdd -> GroupViewType.ADD
+        is GroupData.GroupWant -> GroupViewType.WANT
+        else -> GroupViewType.UNKNOWN
+    }.ordinal
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): GroupViewHolder =
+        when (GroupViewType.from(viewType)) {
+            GroupViewType.TITLE -> TitleViewHolder(
+                context,
+                ItemGroupTitleBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+            )
+
+            GroupViewType.LIST -> ListViewHolder(
+                context,
+                ItemGroupGroupListBinding.inflate(LayoutInflater.from(parent.context), parent, false),
+                onClickItem
+            )
+
+            GroupViewType.ADD -> AddViewHolder(
+                context,
+                ItemGroupGroupAddBinding.inflate(LayoutInflater.from(parent.context), parent, false),
+                onClickAddButton
+            )
+
+            GroupViewType.WANT -> WantViewHolder(
+                context,
+                ItemHomeBottomBinding.inflate(LayoutInflater.from(parent.context), parent, false),
+                onClickItem
+            )
+
+            else -> GroupUnknownViewHolder(
+                ItemUnknownBinding.inflate(LayoutInflater.from(parent.context),parent,false)
+            )
         }
-    }
 
-    override fun getItemCount(): Int {
-        return mItems.size
+    override fun onBindViewHolder(holder: GroupViewHolder, position: Int) {
+        holder.onBind(getItem(position))
     }
 
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when(val item = mItems[position]){
-            is GroupData.GroupTitle -> {
-                (holder as TitleViewHolder).title.visibility = View.VISIBLE
+    class TitleViewHolder(
+        context: Context,
+        private val binding: ItemGroupTitleBinding
+    ) : GroupViewHolder(binding.root) {
+        override fun onBind(item: GroupData) {
+            if (item is GroupData.GroupTitle) {
+                binding.tvGroupTopTitle.text = item.title
             }
-            is GroupData.GroupList -> {
-                (holder as ListViewHolder).projectName.text = item.projectName
-                holder.itemBox.setOnClickListener {
-                    joinItemClick?.onClick(item, position)
+        }
+    }
+
+    class ListViewHolder(
+        context: Context,
+        private val binding: ItemGroupGroupListBinding,
+        private val onClickItem: (Int, GroupData) -> Unit
+    ) : GroupViewHolder(binding.root) {
+        override fun onBind(item: GroupData) {
+            if (item is GroupData.GroupList){
+                binding.tvGroupType.text = if (item.groupType==GroupType.PROJECT)"P" else "S"
+                if (item.groupType==GroupType.PROJECT){
+                    binding.tvGroupType.text = "P"
+                } else {
+                    binding.tvGroupType.setBackgroundResource(R.drawable.ic_level_insignia_study)
+                    binding.tvGroupType.text = "S"
                 }
-                holder.days.text = item.days.toString() + "일째"
-                holder.description.text = item.description
-                holder.tags.text = item.tags
-            }
-            is GroupData.GroupAdd -> {
-                (holder as AddViewHolder).appliedGroup.text = item.appliedGroup
-                holder.addGroup.setOnClickListener {
-                    addItemClick?.onClick(it, position)
+                binding.ivGroupThumbnail.load(item.thumbnail)
+                binding.llGroupItem.setOnClickListener {
+                    onClickItem(adapterPosition, item)
                 }
-            }
-            is GroupData.GroupWant -> {
-                (holder as WantViewHolder).groupType.text = item.groupType
-                holder.title.text = item.title
-                holder.description.text = item.description
-                holder.kind.text = item.kind
-                holder.lv.text = item.lv
-                holder.img.setImageResource(R.mipmap.ic_launcher)
+                binding.tvGroupProjectTitle.text = item.projectName
+                binding.tvGroupDescription.text = item.description
+                binding.tvGroupDays.text = item.days.toString()
+                binding.tvGroupTags.text = "# " +item.tags?.joinToString("   ","","")
             }
         }
     }
 
-    override fun getItemViewType(position: Int): Int {
-        return when(mItems[position]){
-            is GroupData.GroupTitle -> VIEW_TYPE_TITLE
-            is GroupData.GroupList -> VIEW_TYPE_LIST
-            is GroupData.GroupAdd -> VIEW_TYPE_ADD
-            is GroupData.GroupWant -> VIEW_TYPE_WANT
+    class AddViewHolder(
+        context: Context,
+        private val binding: ItemGroupGroupAddBinding,
+        private val onClickAddButton: (Int, GroupData) -> Unit
+    ) : GroupViewHolder(binding.root) {
+        override fun onBind(item: GroupData) {
+            if (item is GroupData.GroupAdd){
+                binding.ivGroupAdd.load(item.addGroupImage)
+                binding.ivGroupAdd.setOnClickListener {
+                    onClickAddButton(adapterPosition, item)
+                }
+                binding.tvGroupAdd.setOnClickListener {
+                    onClickAddButton(adapterPosition, item)
+                }
+                binding.tvGroupAdd.text = item.addGroupText
+                binding.tvGroupAppliedGroup.text = item.appliedGroup
+            }
         }
     }
 
-    inner class TitleViewHolder(binding: ItemGroupTitleBinding) : RecyclerView.ViewHolder(binding.root){
-        val title = binding.root
-    }
-
-    inner class ListViewHolder(binding: ItemGroupGroupListBinding) : RecyclerView.ViewHolder(binding.root){
-        val itemBox = binding.llGroupItem
-        val groupType = binding.tvGroupType
-        val thumbnail = binding.ivGroupThumbnail
-        val projectName = binding.tvGroupProjectTitle
-        val days = binding.tvGroupDays
-        val description = binding.tvMemberDescription
-        val tags = binding.tvGroupTags
-    }
-
-    inner class AddViewHolder(binding: ItemGroupGroupAddBinding) : RecyclerView.ViewHolder(binding.root){
-        val addBtn = binding.ivGroupAdd
-        var addGroup = binding.tvGroupAdd
-        val appliedGroup = binding.tvGroupAppliedGroup
+    class WantViewHolder(
+        context: Context,
+        private val binding: ItemHomeBottomBinding,
+        private val onClickItem: (Int, GroupData) -> Unit
+    ) : GroupViewHolder(binding.root) {
+        override fun onBind(item: GroupData) {
+            if (item is GroupData.GroupWant){
+                binding.ivHomeBottomThumubnail.load(item.img)
+                binding.tvHomeBottomTitle.text = item.title
+                binding.tvHomeBottomDes.text = item.description
+                binding.tvHomeBottomKind.text = item.kind
+                binding.tvHomeBottomLv.text = item.lv
+                binding.layBottom.setOnClickListener {
+                    onClickItem(adapterPosition, item)
+                }
+            }
+        }
     }
 
-    inner class WantViewHolder(binding: ItemHomeBottomBinding) : RecyclerView.ViewHolder(binding.root){
-        val groupType = binding.tvHomeBottomProject
-        val title = binding.tvHomeBottomTitle
-        val description = binding.tvHomeBottomDes
-        val kind = binding.tvHomeBottomKind
-        val lv = binding.tvHomeBottomLv
-        val img = binding.ivHomeBottomThumubnail
+    class GroupUnknownViewHolder(binding: ItemUnknownBinding) :
+        GroupViewHolder(binding.root) {
+        override fun onBind(item: GroupData) = Unit
     }
-
 }

app/src/main/java/com/seven/colink/ui/group/GroupData.kt

@@ -1,21 +1,42 @@
 package com.seven.colink.ui.group
 
-sealed class GroupData {
-    data class GroupTitle(val title: String) : GroupData()
+import com.seven.colink.domain.entity.GroupEntity
+import com.seven.colink.util.status.GroupType
+import java.util.UUID
+
+sealed interface GroupData {
+    data class GroupTitle(
+        val title: String
+    ) : GroupData
+
     data class GroupList(
-        var projectName: String,
-        var days: Int,
-        var description: String,
-        var tags: String
-    ) : GroupData()
+        val key: String?,
+        val groupType: GroupType?,
+        val thumbnail: String?,
+        val projectName: String?,
+        val days: String?,
+        val description: String?,
+        val tags: List<String>? = emptyList(),
+        val memberIds: List<String> = emptyList()
+    ) : GroupData
+
+    data class GroupItem(
+        val group: GroupEntity?
+    ) : GroupData
+
+    data class GroupAdd(
+        val addGroupImage: Int,
+        val addGroupText: String,
+        val appliedGroup: String
+    ) : GroupData
 
-    data class GroupAdd(val addGroup: String , val appliedGroup: String) : GroupData()
     data class GroupWant(
-        var groupType: String,
-        var title: String,
-        var description: String,
-        var kind: String,
-        var lv: String,
-        var img: Int
-    ) : GroupData()
+        val key: String?,
+        val groupType: GroupType?,
+        val title: String?,
+        val description: String?,
+        val kind: String?,
+        val lv: String?,
+        val img: Int?
+    ) : GroupData
 }