새로운 알람 전체보기 페이지 추가

app/src/main/AndroidManifest.xml

@@ -153,9 +153,10 @@
         <activity android:name=".audition.role.AuditionRoleDetailActivity" />
 
         <activity android:name=".audio_content.main.v2.AudioContentMainActivity" />
+        <activity android:name=".audio_content.main.v2.alarm.all.AlarmContentAllActivity" />
+        <activity android:name=".audio_content.main.v2.free.introduce_creator.IntroduceCreatorActivity" />
         <activity android:name=".audio_content.main.v2.series.origianl_audio_drama.OriginalAudioDramaContentAllActivity" />
         <activity android:name=".audio_content.main.v2.series.completed.CompletedSeriesActivity" />
-        <activity android:name=".audio_content.main.v2.free.introduce_creator.IntroduceCreatorActivity" />
 
         <activity android:name=".mypage.alarm.AlarmListActivity" />
         <activity android:name=".mypage.alarm.AddAlarmActivity" />

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

@@ -320,6 +320,14 @@ interface AudioContentApi {
         @Header("Authorization") authHeader: String
     ): Single<ApiResponse<GetContentMainTabAlarmResponse>>
 
+    @GET("/v2/audio-content/main/alarm/all")
+    fun getContentMainAlarmAll(
+        @Query("theme") theme: String,
+        @Query("page") page: Int,
+        @Query("size") size: Int,
+        @Header("Authorization") authHeader: String
+    ): Single<ApiResponse<List<GetAudioContentMainItem>>>
+
     @GET("/v2/audio-content/main/asmr")
     fun getContentMainAsmr(
         @Header("Authorization") authHeader: String

app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/new_content/AudioContentMainNewContentThemeAdapter.kt

@@ -48,8 +48,7 @@ class AudioContentMainNewContentThemeAdapter(
     }
 
     @SuppressLint("NotifyDataSetChanged")
-    fun addItems(themeList: List<String>, selectedTheme: String = "") {
+    fun addItems(themeList: List<String>) {
-        this.selectedTheme = selectedTheme
         this.themeList.clear()
         this.themeList.addAll(themeList)
         notifyDataSetChanged()

app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/v2/alarm/AudioContentMainTabAlarmFragment.kt

@@ -16,13 +16,13 @@ import com.zhpan.bannerview.BaseBannerAdapter
 import com.zhpan.indicator.enums.IndicatorSlideMode
 import com.zhpan.indicator.enums.IndicatorStyle
 import kr.co.vividnext.sodalive.R
-import kr.co.vividnext.sodalive.audio_content.all.AudioContentNewAllActivity
 import kr.co.vividnext.sodalive.audio_content.detail.AudioContentDetailActivity
 import kr.co.vividnext.sodalive.audio_content.main.AudioContentBannerType
 import kr.co.vividnext.sodalive.audio_content.main.AudioContentMainContentAdapter
 import kr.co.vividnext.sodalive.audio_content.main.banner.AudioContentMainBannerAdapter
 import kr.co.vividnext.sodalive.audio_content.main.new_content.AudioContentMainNewContentThemeAdapter
 import kr.co.vividnext.sodalive.audio_content.main.v2.AudioContentMainContentCurationAdapter
+import kr.co.vividnext.sodalive.audio_content.main.v2.alarm.all.AlarmContentAllActivity
 import kr.co.vividnext.sodalive.audio_content.series.detail.SeriesDetailActivity
 import kr.co.vividnext.sodalive.base.BaseFragment
 import kr.co.vividnext.sodalive.common.Constants
@@ -150,6 +150,7 @@ class AudioContentMainTabAlarmFragment : BaseFragment<FragmentAudioContentMainTa
 
     private fun setupNewContentTheme() {
         newContentThemeAdapter = AudioContentMainNewContentThemeAdapter {
+            viewModel.getContentMainAlarm(it)
         }
 
         binding.rvNewContentTheme.layoutManager = LinearLayoutManager(
@@ -190,20 +191,13 @@ class AudioContentMainTabAlarmFragment : BaseFragment<FragmentAudioContentMainTa
 
         viewModel.themeListLiveData.observe(viewLifecycleOwner) {
             binding.llNewContent.visibility = View.VISIBLE
-            newContentThemeAdapter.addItems(
+            newContentThemeAdapter.addItems(it)
-                it,
-                selectedTheme = if (it.isNotEmpty()) {
-                    it[0]
-                } else {
-                    ""
-                }
-            )
         }
     }
 
     private fun setupNewContent() {
         binding.ivNewContentAll.setOnClickListener {
-            startActivity(Intent(requireContext(), AudioContentNewAllActivity::class.java))
+            startActivity(Intent(requireContext(), AlarmContentAllActivity::class.java))
         }
 
         newContentAdapter = AudioContentMainContentAdapter(

app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/v2/alarm/AudioContentMainTabAlarmRepository.kt

@@ -4,4 +4,15 @@ import kr.co.vividnext.sodalive.audio_content.AudioContentApi
 
 class AudioContentMainTabAlarmRepository(private val api: AudioContentApi) {
     fun getContentMainAlarm(token: String) = api.getContentMainAlarm(authHeader = token)
+    fun getContentMainAlarmAll(
+        theme: String,
+        page: Int,
+        size: Int,
+        token: String
+    ) = api.getContentMainAlarmAll(
+        theme = theme,
+        page = page - 1,
+        size = size,
+        authHeader = token
+    )
 }

app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/v2/alarm/AudioContentMainTabAlarmViewModel.kt

@@ -55,7 +55,10 @@ class AudioContentMainTabAlarmViewModel(
                             val data = it.data
 
                             _contentBannerLiveData.value = data.contentBannerList
-                            _themeListLiveData.value = data.alarmThemeList
+
+                            val themeList = listOf("전체").union(data.alarmThemeList).toList()
+                            _themeListLiveData.value = themeList
+
                             _newContentListLiveData.value = data.newAlarmContentList
                             _eventLiveData.value = data.eventBannerList.eventList
                             _curationListLiveData.value = data.curationList
@@ -79,4 +82,45 @@ class AudioContentMainTabAlarmViewModel(
                 )
         )
     }
+
+    fun getContentMainAlarm(selectedTheme: String) {
+            _isLoading.value = true
+
+            compositeDisposable.add(
+                repository.getContentMainAlarmAll(
+                    theme = if (selectedTheme == "전체") {
+                        ""
+                    } else {
+                        selectedTheme
+                    },
+                    page = 1,
+                    size = 10,
+                    token = "Bearer ${SharedPreferenceManager.token}"
+                )
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(
+                        {
+                            if (it.success && it.data != null) {
+                                _newContentListLiveData.value = it.data!!
+                            } else {
+                                if (it.message != null) {
+                                    _toastLiveData.postValue(it.message)
+                                } else {
+                                    _toastLiveData.postValue(
+                                        "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요."
+                                    )
+                                }
+                            }
+
+                            _isLoading.value = false
+                        },
+                        {
+                            _isLoading.value = false
+                            it.message?.let { message -> Logger.e(message) }
+                            _toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.")
+                        }
+                    )
+            )
+        }
 }

app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/v2/alarm/all/AlarmContentAllActivity.kt

@@ -0,0 +1,158 @@
+package kr.co.vividnext.sodalive.audio_content.main.v2.alarm.all
+
+import android.content.Intent
+import android.graphics.Rect
+import android.os.Bundle
+import android.view.View
+import android.widget.Toast
+import androidx.annotation.OptIn
+import androidx.media3.common.util.UnstableApi
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import kr.co.vividnext.sodalive.audio_content.all.AudioContentNewAllAdapter
+import kr.co.vividnext.sodalive.audio_content.detail.AudioContentDetailActivity
+import kr.co.vividnext.sodalive.audio_content.main.new_content.AudioContentMainNewContentThemeAdapter
+import kr.co.vividnext.sodalive.base.BaseActivity
+import kr.co.vividnext.sodalive.common.Constants
+import kr.co.vividnext.sodalive.common.GridSpacingItemDecoration
+import kr.co.vividnext.sodalive.common.LoadingDialog
+import kr.co.vividnext.sodalive.databinding.ActivityAlarmContentAllBinding
+import kr.co.vividnext.sodalive.explorer.profile.UserProfileActivity
+import kr.co.vividnext.sodalive.extensions.dpToPx
+import org.koin.android.ext.android.inject
+
+@OptIn(UnstableApi::class)
+class AlarmContentAllActivity : BaseActivity<ActivityAlarmContentAllBinding>(
+    ActivityAlarmContentAllBinding::inflate
+) {
+    private val viewModel: AlarmContentAllViewModel by inject()
+
+    private lateinit var loadingDialog: LoadingDialog
+
+    private lateinit var newContentThemeAdapter: AudioContentMainNewContentThemeAdapter
+    private lateinit var newContentAdapter: AudioContentNewAllAdapter
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        bindData()
+        viewModel.getContentMainAlarmAll()
+
+        newContentThemeAdapter.addItems(listOf("전체", "모닝콜", "슬립콜", "알람"))
+    }
+
+    override fun setupView() {
+        loadingDialog = LoadingDialog(this, layoutInflater)
+        binding.toolbar.tvBack.text = "새로운 알람"
+        binding.toolbar.tvBack.setOnClickListener { finish() }
+
+        setupNewContentTheme()
+        setupNewContent()
+    }
+
+    private fun setupNewContentTheme() {
+        newContentThemeAdapter = AudioContentMainNewContentThemeAdapter {
+            newContentAdapter.clear()
+            viewModel.selectTheme(it)
+        }
+
+        binding.rvNewContentTheme.layoutManager = LinearLayoutManager(
+            this,
+            LinearLayoutManager.HORIZONTAL,
+            false
+        )
+
+        binding.rvNewContentTheme.addItemDecoration(object : RecyclerView.ItemDecoration() {
+            override fun getItemOffsets(
+                outRect: Rect,
+                view: View,
+                parent: RecyclerView,
+                state: RecyclerView.State
+            ) {
+                super.getItemOffsets(outRect, view, parent, state)
+
+                when (parent.getChildAdapterPosition(view)) {
+                    0 -> {
+                        outRect.left = 0
+                        outRect.right = 4f.dpToPx().toInt()
+                    }
+
+                    newContentThemeAdapter.itemCount - 1 -> {
+                        outRect.left = 4f.dpToPx().toInt()
+                        outRect.right = 0
+                    }
+
+                    else -> {
+                        outRect.left = 4f.dpToPx().toInt()
+                        outRect.right = 4f.dpToPx().toInt()
+                    }
+                }
+            }
+        })
+
+        binding.rvNewContentTheme.adapter = newContentThemeAdapter
+    }
+
+    private fun setupNewContent() {
+        val spanCount = 3
+        val spacing = 40
+        newContentAdapter = AudioContentNewAllAdapter(
+            itemWidth = (screenWidth - (spacing * (spanCount + 1))) / 3,
+            onClickItem = {
+                startActivity(
+                    Intent(this, AudioContentDetailActivity::class.java).apply {
+                        putExtra(Constants.EXTRA_AUDIO_CONTENT_ID, it)
+                    }
+                )
+            },
+            onClickCreator = {
+                startActivity(
+                    Intent(this, UserProfileActivity::class.java).apply {
+                        putExtra(Constants.EXTRA_USER_ID, it)
+                    }
+                )
+            }
+        )
+
+        binding.rvContent.layoutManager = GridLayoutManager(this, spanCount)
+        binding.rvContent.addItemDecoration(GridSpacingItemDecoration(spanCount, spacing, true))
+
+        binding.rvContent.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.getContentMainAlarmAll()
+                }
+            }
+        })
+
+        binding.rvContent.adapter = newContentAdapter
+    }
+
+    private fun bindData() {
+        viewModel.isLoading.observe(this) {
+            if (it) {
+                loadingDialog.show(screenWidth)
+            } else {
+                loadingDialog.dismiss()
+            }
+        }
+
+        viewModel.toastLiveData.observe(this) {
+            it?.let { Toast.makeText(applicationContext, it, Toast.LENGTH_LONG).show() }
+        }
+
+        viewModel.newContentListLiveData.observe(this) {
+            newContentAdapter.addItems(it)
+        }
+    }
+}

app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/v2/alarm/all/AlarmContentAllViewModel.kt

@@ -0,0 +1,87 @@
+package kr.co.vividnext.sodalive.audio_content.main.v2.alarm.all
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import com.orhanobut.logger.Logger
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.schedulers.Schedulers
+import kr.co.vividnext.sodalive.audio_content.main.GetAudioContentMainItem
+import kr.co.vividnext.sodalive.audio_content.main.v2.alarm.AudioContentMainTabAlarmRepository
+import kr.co.vividnext.sodalive.base.BaseViewModel
+import kr.co.vividnext.sodalive.common.SharedPreferenceManager
+
+class AlarmContentAllViewModel(
+    private val repository: AudioContentMainTabAlarmRepository
+) : BaseViewModel() {
+    private val _toastLiveData = MutableLiveData<String?>()
+    val toastLiveData: LiveData<String?>
+        get() = _toastLiveData
+
+    private var _isLoading = MutableLiveData(false)
+    val isLoading: LiveData<Boolean>
+        get() = _isLoading
+
+    private var _newContentListLiveData = MutableLiveData<List<GetAudioContentMainItem>>()
+    val newContentListLiveData: LiveData<List<GetAudioContentMainItem>>
+        get() = _newContentListLiveData
+
+    private var isLast = false
+    private var page = 1
+    private val size = 10
+    private var selectedTheme = ""
+
+    fun getContentMainAlarmAll() {
+        if (!_isLoading.value!! && !isLast) {
+            _isLoading.value = true
+
+            compositeDisposable.add(
+                repository.getContentMainAlarmAll(
+                    theme = if (selectedTheme == "전체") {
+                        ""
+                    } else {
+                        selectedTheme
+                    },
+                    page = page,
+                    size = size,
+                    token = "Bearer ${SharedPreferenceManager.token}"
+                )
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(
+                        {
+                            if (it.success && it.data != null) {
+                                if (it.data.isNotEmpty()) {
+                                    page += 1
+                                    _newContentListLiveData.value = it.data!!
+                                } else {
+                                    isLast = true
+                                }
+                            } else {
+                                if (it.message != null) {
+                                    _toastLiveData.postValue(it.message)
+                                } else {
+                                    _toastLiveData.postValue(
+                                        "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요."
+                                    )
+                                }
+                            }
+
+                            _isLoading.value = false
+                        },
+                        {
+                            _isLoading.value = false
+                            it.message?.let { message -> Logger.e(message) }
+                            _toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.")
+                        }
+                    )
+            )
+        }
+    }
+
+    fun selectTheme(theme: String) {
+        isLast = false
+        page = 1
+        selectedTheme = theme
+        getContentMainAlarmAll()
+    }
+}

app/src/main/java/kr/co/vividnext/sodalive/di/AppDI.kt

@@ -25,6 +25,7 @@ import kr.co.vividnext.sodalive.audio_content.main.ranking.AudioContentMainRanki
 import kr.co.vividnext.sodalive.audio_content.main.recommend_series.AudioContentMainRecommendSeriesViewModel
 import kr.co.vividnext.sodalive.audio_content.main.v2.alarm.AudioContentMainTabAlarmRepository
 import kr.co.vividnext.sodalive.audio_content.main.v2.alarm.AudioContentMainTabAlarmViewModel
+import kr.co.vividnext.sodalive.audio_content.main.v2.alarm.all.AlarmContentAllViewModel
 import kr.co.vividnext.sodalive.audio_content.main.v2.asmr.AudioContentMainTabAsmrRepository
 import kr.co.vividnext.sodalive.audio_content.main.v2.asmr.AudioContentMainTabAsmrViewModel
 import kr.co.vividnext.sodalive.audio_content.main.v2.content.AudioContentMainTabContentRepository
@@ -318,6 +319,7 @@ class AppDI(private val context: Context, isDebugMode: Boolean) {
         viewModel { OriginalAudioDramaContentAllViewModel(get()) }
         viewModel { IntroduceCreatorViewModel(get()) }
         viewModel { CompletedSeriesViewModel(get()) }
+        viewModel { AlarmContentAllViewModel(get()) }
     }
 
     private val repositoryModule = module {

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

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/black"
+    android:orientation="vertical">
+
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/detail_toolbar" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="13.3dp"
+        android:background="@color/color_222222"
+        android:fontFamily="@font/gmarket_sans_medium"
+        android:paddingHorizontal="13.3dp"
+        android:paddingVertical="8dp"
+        android:text="※ 최근 2주간 등록된 새로운 알람 입니다."
+        android:textSize="14.67sp" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rv_new_content_theme"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="13.3dp"
+        android:clipToPadding="false"
+        android:paddingHorizontal="13.3dp" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rv_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clipToPadding="false" />
+</LinearLayout>