From 13cf90590620dbe4005387e58e64a3ec3fe15f6a Mon Sep 17 00:00:00 2001 From: leeeha Date: Sun, 23 Apr 2023 23:19:55 +0900 Subject: [PATCH] =?UTF-8?q?[REFACTOR/#3]=20=EB=A9=80=ED=8B=B0=20=EB=B7=B0?= =?UTF-8?q?=20=EC=95=84=EC=9D=B4=ED=85=9C=20=EC=9D=B4=EB=A6=84=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/android/go/sopt/ui/main/data/DataSources.kt | 4 ++-- .../go/sopt/ui/main/gallery/adapter/MyListAdapter.kt | 1 - .../go/sopt/ui/main/home/adapter/MultiViewAdapter.kt | 4 ---- .../go/sopt/ui/main/home/adapter/MultiViewHolder.kt | 8 ++++---- .../android/go/sopt/ui/main/home/adapter/MultiViewItem.kt | 4 ++-- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/org/android/go/sopt/ui/main/data/DataSources.kt b/app/src/main/java/org/android/go/sopt/ui/main/data/DataSources.kt index 46bb687..374fe98 100644 --- a/app/src/main/java/org/android/go/sopt/ui/main/data/DataSources.kt +++ b/app/src/main/java/org/android/go/sopt/ui/main/data/DataSources.kt @@ -10,11 +10,11 @@ object DataSources { fun loadHomeDataSet(): ArrayList { val multiViewItems = arrayListOf().apply { - add(MultiViewItem.TextItem("하은의 레포지토리")) + add(MultiViewItem.Header("하은의 레포지토리")) for (i in 1..HOME_ITEM_NUM) { add( - MultiViewItem.ImageItem( + MultiViewItem.Repo( R.drawable.ic_launcher_background, "name $i", "author $i" diff --git a/app/src/main/java/org/android/go/sopt/ui/main/gallery/adapter/MyListAdapter.kt b/app/src/main/java/org/android/go/sopt/ui/main/gallery/adapter/MyListAdapter.kt index 2e0ccf6..7cf1752 100644 --- a/app/src/main/java/org/android/go/sopt/ui/main/gallery/adapter/MyListAdapter.kt +++ b/app/src/main/java/org/android/go/sopt/ui/main/gallery/adapter/MyListAdapter.kt @@ -1,6 +1,5 @@ package org.android.go.sopt.ui.main.gallery.adapter -import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.ListAdapter diff --git a/app/src/main/java/org/android/go/sopt/ui/main/home/adapter/MultiViewAdapter.kt b/app/src/main/java/org/android/go/sopt/ui/main/home/adapter/MultiViewAdapter.kt index 2b59d20..0d3eb79 100644 --- a/app/src/main/java/org/android/go/sopt/ui/main/home/adapter/MultiViewAdapter.kt +++ b/app/src/main/java/org/android/go/sopt/ui/main/home/adapter/MultiViewAdapter.kt @@ -25,8 +25,4 @@ class MultiViewAdapter( override fun getItemViewType(position: Int): Int { return itemList[position].getViewType().ordinal } - - fun scrollToTop() { - - } } diff --git a/app/src/main/java/org/android/go/sopt/ui/main/home/adapter/MultiViewHolder.kt b/app/src/main/java/org/android/go/sopt/ui/main/home/adapter/MultiViewHolder.kt index 754d4a6..bce7004 100644 --- a/app/src/main/java/org/android/go/sopt/ui/main/home/adapter/MultiViewHolder.kt +++ b/app/src/main/java/org/android/go/sopt/ui/main/home/adapter/MultiViewHolder.kt @@ -12,16 +12,16 @@ sealed class MultiViewHolder( class TextViewHolder( private val binding: ItemTextBinding - ) : MultiViewHolder(binding) { - override fun bind(item: MultiViewItem.TextItem) { + ) : MultiViewHolder(binding) { + override fun bind(item: MultiViewItem.Header) { binding.title = item.title } } class ImageViewHolder( private val binding: ItemImageBinding - ) : MultiViewHolder(binding) { - override fun bind(item: MultiViewItem.ImageItem) { + ) : MultiViewHolder(binding) { + override fun bind(item: MultiViewItem.Repo) { with(binding){ ivImage.setImageResource(item.imageRes) name = item.name diff --git a/app/src/main/java/org/android/go/sopt/ui/main/home/adapter/MultiViewItem.kt b/app/src/main/java/org/android/go/sopt/ui/main/home/adapter/MultiViewItem.kt index 9803a83..68a1f2d 100644 --- a/app/src/main/java/org/android/go/sopt/ui/main/home/adapter/MultiViewItem.kt +++ b/app/src/main/java/org/android/go/sopt/ui/main/home/adapter/MultiViewItem.kt @@ -5,9 +5,9 @@ import androidx.annotation.DrawableRes sealed class MultiViewItem( private val viewType: MultiViewType ) { - data class TextItem(val title: String) : MultiViewItem(MultiViewType.TEXT) + data class Header(val title: String) : MultiViewItem(MultiViewType.TEXT) - data class ImageItem( + data class Repo( @DrawableRes val imageRes: Int, val name: String, val author: String