콘텐츠 보관함(구매목록)

- 중복구현 제거

app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderListActivity.kt

@@ -8,124 +8,32 @@ import android.view.View
 import android.widget.Toast
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import kr.co.vividnext.sodalive.R
 import kr.co.vividnext.sodalive.audio_content.detail.AudioContentDetailActivity
 import kr.co.vividnext.sodalive.base.BaseActivity
 import kr.co.vividnext.sodalive.common.Constants
 import kr.co.vividnext.sodalive.common.LoadingDialog
 import kr.co.vividnext.sodalive.databinding.ActivityAudioContentOrderListBinding
 import kr.co.vividnext.sodalive.extensions.dpToPx
-import org.koin.android.ext.android.inject
 
 class AudioContentOrderListActivity : BaseActivity<ActivityAudioContentOrderListBinding>(
     ActivityAudioContentOrderListBinding::inflate
 ) {
 
-    private val viewModel: AudioContentOrderListViewModel by inject()
-
-    private lateinit var loadingDialog: LoadingDialog
-    private lateinit var adapter: AudioContentOrderListAdapter
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        bindData()
+        supportFragmentManager.beginTransaction()
-        viewModel.getAudioContentOrderList { finish() }
+            .replace(R.id.fl_container, AudioContentOrderListFragment())
+            .commit()
     }
 
     override fun setupView() {
-        loadingDialog = LoadingDialog(this, layoutInflater)
+        setupToolbar()
+    }
+
+    private fun setupToolbar() {
         binding.toolbar.tvBack.text = "콘텐츠 보관함"
         binding.toolbar.tvBack.setOnClickListener { finish() }
-
-        adapter = AudioContentOrderListAdapter {
-            startActivity(
-                Intent(applicationContext, AudioContentDetailActivity::class.java)
-                    .apply { putExtra(Constants.EXTRA_AUDIO_CONTENT_ID, it) }
-            )
-        }
-
-        binding.rvOrderList.layoutManager = LinearLayoutManager(
-            applicationContext,
-            LinearLayoutManager.VERTICAL,
-            false
-        )
-
-        binding.rvOrderList.addItemDecoration(object : RecyclerView.ItemDecoration() {
-            override fun getItemOffsets(
-                outRect: Rect,
-                view: View,
-                parent: RecyclerView,
-                state: RecyclerView.State
-            ) {
-                super.getItemOffsets(outRect, view, parent, state)
-
-                outRect.left = 13.3f.dpToPx().toInt()
-                outRect.right = 13.3f.dpToPx().toInt()
-
-                when (parent.getChildAdapterPosition(view)) {
-                    0 -> {
-                        outRect.top = 13.3f.dpToPx().toInt()
-                        outRect.bottom = 6.7f.dpToPx().toInt()
-                    }
-
-                    adapter.itemCount - 1 -> {
-                        outRect.top = 6.7f.dpToPx().toInt()
-                        outRect.bottom = 13.3f.dpToPx().toInt()
-                    }
-
-                    else -> {
-                        outRect.top = 6.7f.dpToPx().toInt()
-                        outRect.bottom = 6.7f.dpToPx().toInt()
-                    }
-                }
-            }
-        })
-
-        binding.rvOrderList.addOnScrollListener(object : RecyclerView.OnScrollListener() {
-            override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-                super.onScrolled(recyclerView, dx, dy)
-
-                val lastVisibleItemPosition = (recyclerView.layoutManager as LinearLayoutManager?)!!
-                    .findLastCompletelyVisibleItemPosition()
-                val itemTotalCount = recyclerView.adapter!!.itemCount - 1
-
-                // 스크롤이 끝에 도달했는지 확인
-                if (!recyclerView.canScrollVertically(1) &&
-                    lastVisibleItemPosition == itemTotalCount
-                ) {
-                    viewModel.getAudioContentOrderList {}
-                }
-            }
-        })
-
-        binding.rvOrderList.adapter = adapter
-    }
-
-    @SuppressLint("NotifyDataSetChanged")
-    private fun bindData() {
-        viewModel.toastLiveData.observe(this) {
-            it?.let { Toast.makeText(applicationContext, it, Toast.LENGTH_LONG).show() }
-        }
-
-        viewModel.isLoading.observe(this) {
-            if (it) {
-                loadingDialog.show(screenWidth, "")
-            } else {
-                loadingDialog.dismiss()
-            }
-        }
-
-        viewModel.orderList.observe(this) {
-            if (viewModel.page == 2) {
-                adapter.items.clear()
-            }
-
-            adapter.items.addAll(it)
-            adapter.notifyDataSetChanged()
-        }
-
-        viewModel.totalCount.observe(this) {
-            binding.tvTotalCount.text = "$it"
-        }
     }
 }

app/src/main/res/layout/activity_audio_content_order_list.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/black"
@@ -10,44 +10,13 @@
         android:id="@+id/toolbar"
         layout="@layout/detail_toolbar" />
 
-    <LinearLayout
+    <FrameLayout
-        android:id="@+id/ll_total_count"
+        android:id="@+id/fl_container"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_marginTop="13.3dp"
-        android:gravity="center_vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
-        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
-        android:paddingHorizontal="13.3dp">
+        app:layout_constraintStart_toStartOf="parent"
-
+        app:layout_constraintTop_toBottomOf="@+id/toolbar" />
-        <TextView
+</androidx.constraintlayout.widget.ConstraintLayout>
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:fontFamily="@font/gmarket_sans_medium"
-            android:text="총 "
-            android:textColor="@color/color_eeeeee"
-            android:textSize="12sp" />
-
-        <TextView
-            android:id="@+id/tv_total_count"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:fontFamily="@font/gmarket_sans_medium"
-            android:textColor="@color/color_dd4500"
-            android:textSize="12sp"
-            tools:text=" 10" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:fontFamily="@font/gmarket_sans_medium"
-            android:text=" 개"
-            android:textColor="@color/color_eeeeee"
-            android:textSize="12sp" />
-    </LinearLayout>
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rv_order_list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="13.3dp" />
-</LinearLayout>