[fix/#21] 코멘트 수정사항 반영

depromeet · Jan 6, 2024 · b188d8b · b188d8b
1 parent f8266b8
commit b188d8b
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 21 deletions.
diff --git a/app/src/main/java/com/teumteum/teumteum/presentation/onboarding/OnBoardingActivity.kt b/app/src/main/java/com/teumteum/teumteum/presentation/onboarding/OnBoardingActivity.kt
@@ -6,7 +6,7 @@ import com.google.android.material.tabs.TabLayoutMediator
 import com.teumteum.base.BindingActivity
 import com.teumteum.base.component.appbar.AppBarLayout
 import com.teumteum.base.databinding.LayoutCommonAppbarBinding
-import com.teumteum.domain.entity.ViewPagerEntity
+import com.teumteum.domain.entity.CommonViewPagerEntity
 import com.teumteum.teumteum.R
 import com.teumteum.teumteum.databinding.ActivityOnboardingBinding
 import com.teumteum.teumteum.presentation.onboarding.adapter.OnBoardingViewPagerAdapter
@@ -18,7 +18,7 @@ class OnBoardingActivity
 
     private val onBoardingViewPagerAdapter = OnBoardingViewPagerAdapter()
 
-    private val viewpagerList = ArrayList<ViewPagerEntity>()
+    private val viewpagerList = ArrayList<CommonViewPagerEntity>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -36,16 +36,20 @@ class OnBoardingActivity
     }
 
     private fun initViewPagerItem() {
-        viewpagerList.add(ViewPagerEntity(getString(R.string.onboarding_tv_namecard_title), getString(R.string.onboarding_tv_namecard_subtitle), 0))
-        viewpagerList.add(ViewPagerEntity(getString(R.string.onboarding_tv_meet_title), getString(R.string.onboarding_tv_meet_subtitle), 0))
-        viewpagerList.add(ViewPagerEntity(getString(R.string.onboarding_tv_networking_title), getString(R.string.onboarding_tv_networking_subtitle), 0))
+        with(viewpagerList) {
+            add(CommonViewPagerEntity(getString(R.string.onboarding_tv_namecard_title), getString(R.string.onboarding_tv_namecard_subtitle), 0))
+            add(CommonViewPagerEntity(getString(R.string.onboarding_tv_meet_title), getString(R.string.onboarding_tv_meet_subtitle), 0))
+            add(CommonViewPagerEntity(getString(R.string.onboarding_tv_networking_title), getString(R.string.onboarding_tv_networking_subtitle), 0))
+        }
     }
 
     private fun initViewPager() {
         onBoardingViewPagerAdapter.submitList(viewpagerList)
-        binding.vp.adapter = onBoardingViewPagerAdapter
-        binding.vp.getChildAt(0).overScrollMode = RecyclerView.OVER_SCROLL_NEVER
-        binding.tl.clearOnTabSelectedListeners()
+        with(binding) {
+            vp.adapter = onBoardingViewPagerAdapter
+            vp.getChildAt(0).overScrollMode = RecyclerView.OVER_SCROLL_NEVER
+            tl.clearOnTabSelectedListeners()
+        }
         TabLayoutMediator(binding.tl, binding.vp) { tab, _ ->
             tab.view.isClickable = false
         }.attach()

diff --git a/.../java/com/teumteum/teumteum/presentation/onboarding/adapter/OnBoardingViewPagerAdapter.kt b/.../java/com/teumteum/teumteum/presentation/onboarding/adapter/OnBoardingViewPagerAdapter.kt
@@ -5,41 +5,42 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
-import com.teumteum.domain.entity.ViewPagerEntity
+import com.teumteum.domain.entity.CommonViewPagerEntity
 import com.teumteum.teumteum.databinding.ItemOnboardingViewpagerBinding
 
-class OnBoardingViewPagerAdapter: ListAdapter<ViewPagerEntity, OnBoardingViewPagerAdapter.ItemViewHolder>(ItemListDiffCallback) {
+class OnBoardingViewPagerAdapter: ListAdapter<CommonViewPagerEntity, OnBoardingViewPagerAdapter.ItemViewHolder>(ItemListDiffCallback) {
     private lateinit var binding: ItemOnboardingViewpagerBinding
 
     override fun onCreateViewHolder(
         parent: ViewGroup,
         viewType: Int
-    ): OnBoardingViewPagerAdapter.ItemViewHolder {
+    ): ItemViewHolder {
         binding = ItemOnboardingViewpagerBinding.inflate(LayoutInflater.from(parent.context), parent, false)
         return ItemViewHolder(binding)
     }
 
-    override fun onBindViewHolder(holder: OnBoardingViewPagerAdapter.ItemViewHolder, position: Int) {
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
         holder.bind(getItem(position))
     }
 
-    inner class ItemViewHolder(private val binding: ItemOnboardingViewpagerBinding)
+    class ItemViewHolder(private val binding: ItemOnboardingViewpagerBinding)
         : RecyclerView.ViewHolder(binding.root) {
-        fun bind(item: ViewPagerEntity) {
-            binding.tvTitle.text = item.title
-            binding.tvSubtitle.text = item.subtitle
-//            binding.rectError.setImageResource()
+        fun bind(item: CommonViewPagerEntity) {
+            with(binding) {
+                tvTitle.text = item.title
+                tvSubtitle.text = item.subtitle
+            }
         }
     }
 
-    object ItemListDiffCallback : DiffUtil.ItemCallback<ViewPagerEntity>() {
-        override fun areItemsTheSame(oldItem: ViewPagerEntity, newItem: ViewPagerEntity): Boolean {
+    object ItemListDiffCallback : DiffUtil.ItemCallback<CommonViewPagerEntity>() {
+        override fun areItemsTheSame(oldItem: CommonViewPagerEntity, newItem: CommonViewPagerEntity): Boolean {
             return oldItem == newItem
         }
 
         override fun areContentsTheSame(
-            oldItem: ViewPagerEntity,
-            newItem: ViewPagerEntity
+            oldItem: CommonViewPagerEntity,
+            newItem: CommonViewPagerEntity
         ): Boolean {
             return oldItem.title == newItem.title
         }