diff --git a/app/src/main/java/com/sopt/now/data/MultiData.kt b/app/src/main/java/com/sopt/now/data/ItemData.kt similarity index 83% rename from app/src/main/java/com/sopt/now/data/MultiData.kt rename to app/src/main/java/com/sopt/now/data/ItemData.kt index 13fa2a1..3e24bbb 100644 --- a/app/src/main/java/com/sopt/now/data/MultiData.kt +++ b/app/src/main/java/com/sopt/now/data/ItemData.kt @@ -2,20 +2,20 @@ package com.sopt.now.data import androidx.annotation.DrawableRes -sealed class MultiData { +sealed class ItemData { data class MyProfile( @DrawableRes val profileImage: Int?, val name: String, val description: String?, - ) : MultiData() + ) : ItemData() data class Friend( @DrawableRes val profileImage: Int?, val name: String, val description: String?, - ) : MultiData() + ) : ItemData() } \ No newline at end of file diff --git a/app/src/main/java/com/sopt/now/ui/adapter/ItemAdapter.kt b/app/src/main/java/com/sopt/now/ui/adapter/ItemAdapter.kt index cc6d108..b1dc9a6 100644 --- a/app/src/main/java/com/sopt/now/ui/adapter/ItemAdapter.kt +++ b/app/src/main/java/com/sopt/now/ui/adapter/ItemAdapter.kt @@ -5,11 +5,11 @@ import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView.ViewHolder -import com.sopt.now.data.MultiData +import com.sopt.now.data.ItemData import com.sopt.now.databinding.ItemFriendBinding import com.sopt.now.databinding.ItemMyProfileBinding -class ItemAdapter(private val items: MutableList) : RecyclerView.Adapter() { +class ItemAdapter(private val items: MutableList) : RecyclerView.Adapter() { companion object { private const val VIEW_TYPE_MY_PROFILE = 0 @@ -40,13 +40,13 @@ class ItemAdapter(private val items: MutableList) : RecyclerView.Adap override fun onBindViewHolder(holder: ViewHolder, position: Int) { when (val item = items[position]) { - is MultiData.MyProfile -> { + is ItemData.MyProfile -> { (holder as MyProfileViewHolder).profileImage.setImageResource(item.profileImage!!) holder.name.text = item.name holder.description.text = item.description } - is MultiData.Friend -> { + is ItemData.Friend -> { (holder as FriendViewHolder).profileImage.setImageResource(item.profileImage!!) holder.name.text = item.name holder.description.text = item.description @@ -64,8 +64,8 @@ class ItemAdapter(private val items: MutableList) : RecyclerView.Adap override fun getItemViewType(position: Int): Int { return when (items[position]) { - is MultiData.MyProfile -> VIEW_TYPE_MY_PROFILE - is MultiData.Friend -> VIEW_TYPE_FRIEND + is ItemData.MyProfile -> VIEW_TYPE_MY_PROFILE + is ItemData.Friend -> VIEW_TYPE_FRIEND } } diff --git a/app/src/main/java/com/sopt/now/ui/home/HomFragment.kt b/app/src/main/java/com/sopt/now/ui/home/HomFragment.kt index b56bb78..9318151 100644 --- a/app/src/main/java/com/sopt/now/ui/home/HomFragment.kt +++ b/app/src/main/java/com/sopt/now/ui/home/HomFragment.kt @@ -6,7 +6,7 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.viewModels -import com.sopt.now.data.MultiData +import com.sopt.now.data.ItemData import com.sopt.now.databinding.FragmentHomeBinding import com.sopt.now.ui.adapter.ItemAdapter import com.sopt.now.ui.home.viewModel.HomeViewModel @@ -38,11 +38,11 @@ class HomeFragment : Fragment() { } override fun onDestroy() { - super.onDestroy() _binding = null + super.onDestroy() } - private fun setFriendList(friendList: List) { + private fun setFriendList(friendList: List) { friendList.toList() } diff --git a/app/src/main/java/com/sopt/now/ui/home/viewModel/HomeViewModel.kt b/app/src/main/java/com/sopt/now/ui/home/viewModel/HomeViewModel.kt index 6c09861..f390781 100644 --- a/app/src/main/java/com/sopt/now/ui/home/viewModel/HomeViewModel.kt +++ b/app/src/main/java/com/sopt/now/ui/home/viewModel/HomeViewModel.kt @@ -2,72 +2,72 @@ package com.sopt.now.ui.home.viewModel import androidx.lifecycle.ViewModel import com.sopt.now.R -import com.sopt.now.data.MultiData +import com.sopt.now.data.ItemData class HomeViewModel : ViewModel() { val friendList = mutableListOf( - MultiData.MyProfile( + ItemData.MyProfile( profileImage = R.drawable.img_arin, name = "김아린", description = "업보 청산 중..", ), - MultiData.Friend( + ItemData.Friend( profileImage = R.drawable.img_profile0, name = "이의경", description = "김아린 과제 벼락치기 하지 마라", ), - MultiData.Friend( + ItemData.Friend( profileImage = R.drawable.img_profile1, name = "최준서", description = "오운완 ㅋㅋ", ), - MultiData.Friend( + ItemData.Friend( profileImage = R.drawable.img_profile2, name = "이연진", description = "아리니 넘 기엽당..", ), - MultiData.Friend( + ItemData.Friend( profileImage = R.drawable.img_profile3, name = "손민재", description = "점심 뭐 먹지?", ), - MultiData.Friend( + ItemData.Friend( profileImage = R.drawable.img_profile4, name = "홍해인", description = "난 눈물의 여왕이야", ), - MultiData.Friend( + ItemData.Friend( profileImage = R.drawable.img_profile5, name = "백현우", description = "눈물의여왕시작하지말걸공부가안된다", ), - MultiData.Friend( + ItemData.Friend( profileImage = R.drawable.img_profile6, name = "이서경", description = "저는 환연 과몰입러예요", ), - MultiData.Friend( + ItemData.Friend( profileImage = R.drawable.img_profile7, name = "이주원", description = "너가 자기야 미안해 했잖아?", ), - MultiData.Friend( + ItemData.Friend( profileImage = R.drawable.img_profile8, name = "김광태", description = "내일 뭐 해?", ), - MultiData.Friend( + ItemData.Friend( profileImage = R.drawable.img_profile9, name = "정현규", description = "내봬누", ), - MultiData.Friend( + ItemData.Friend( profileImage = R.drawable.img_profile10, name = "성해은", description = "벌써 스물 아홉이야", ), - MultiData.Friend( + ItemData.Friend( profileImage = R.drawable.img_profile11, name = "정규민", description = "오마카세 사줄게", diff --git a/app/src/main/res/layout/fragment_my_page.xml b/app/src/main/res/layout/fragment_my_page.xml index d06a495..151463d 100644 --- a/app/src/main/res/layout/fragment_my_page.xml +++ b/app/src/main/res/layout/fragment_my_page.xml @@ -24,99 +24,55 @@ android:layout_marginBottom="16dp" android:importantForAccessibility="no" android:src="@drawable/ic_launcher_background" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - - - - - - - - \ No newline at end of file