From 326ad0198324db63199eb0f97851b1e514e88273 Mon Sep 17 00:00:00 2001 From: klaus Date: Wed, 4 Dec 2024 19:14:23 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9E=AC=EC=83=9D=20=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?=EB=A7=8C=EB=93=A4=EA=B8=B0=20-=20=EC=BD=98=ED=85=90=EC=B8=A0?= =?UTF-8?q?=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20-=20=EC=86=8C=EC=9E=A5=20?= =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=EB=A7=8C=20=EB=82=98=EC=98=A4?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../co/vividnext/sodalive/audio_content/AudioContentApi.kt | 2 ++ .../sodalive/audio_content/AudioContentRepository.kt | 2 ++ .../audio_content/order/AudioContentOrderListViewModel.kt | 3 ++- .../create/add_content/PlaylistAddContentDialogFragment.kt | 5 +++-- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentApi.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentApi.kt index 3ca3126..72585a0 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentApi.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentApi.kt @@ -18,6 +18,7 @@ import kr.co.vividnext.sodalive.audio_content.main.GetAudioContentRanking import kr.co.vividnext.sodalive.audio_content.main.GetNewContentUploadCreator import kr.co.vividnext.sodalive.audio_content.order.GetAudioContentOrderListResponse import kr.co.vividnext.sodalive.audio_content.order.OrderRequest +import kr.co.vividnext.sodalive.audio_content.order.OrderType import kr.co.vividnext.sodalive.audio_content.upload.theme.GetAudioContentThemeResponse import kr.co.vividnext.sodalive.common.ApiResponse import kr.co.vividnext.sodalive.explorer.profile.GetAudioContentListResponse @@ -86,6 +87,7 @@ interface AudioContentApi { @GET("/order/audio-content") fun getAudioContentOrderList( + @Query("orderType") orderType: OrderType? = null, @Query("page") page: Int, @Query("size") size: Int, @Header("Authorization") authHeader: String diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentRepository.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentRepository.kt index c3949f9..bf96ba0 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentRepository.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentRepository.kt @@ -118,10 +118,12 @@ class AudioContentRepository( ) fun getAudioContentOrderList( + orderType: OrderType? = null, page: Int, size: Int, token: String ) = api.getAudioContentOrderList( + orderType = orderType, page = page - 1, size = size, authHeader = token diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderListViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderListViewModel.kt index 7baacdb..a5f8882 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderListViewModel.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderListViewModel.kt @@ -33,11 +33,12 @@ class AudioContentOrderListViewModel( var page = 1 private val size = 10 - fun getAudioContentOrderList(onFailure: (() -> Unit)? = null) { + fun getAudioContentOrderList(orderType: OrderType? = null, onFailure: (() -> Unit)? = null) { if (_isLoading.value == false) { _isLoading.value = true compositeDisposable.add( repository.getAudioContentOrderList( + orderType = orderType, page = page, size = size, token = "Bearer ${SharedPreferenceManager.token}" diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/create/add_content/PlaylistAddContentDialogFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/create/add_content/PlaylistAddContentDialogFragment.kt index 170a941..2ca42cd 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/create/add_content/PlaylistAddContentDialogFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/create/add_content/PlaylistAddContentDialogFragment.kt @@ -17,6 +17,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.bottomsheet.BottomSheetDialogFragment import kr.co.vividnext.sodalive.audio_content.order.AudioContentOrderListViewModel import kr.co.vividnext.sodalive.audio_content.order.GetAudioContentOrderListItem +import kr.co.vividnext.sodalive.audio_content.order.OrderType import kr.co.vividnext.sodalive.audio_content.playlist.create.AudioContentPlaylistCreateActivity import kr.co.vividnext.sodalive.common.LoadingDialog import kr.co.vividnext.sodalive.databinding.FragmentPlaylistAddContentBinding @@ -72,7 +73,7 @@ class PlaylistAddContentDialogFragment( setupView() bindData() - viewModel.getAudioContentOrderList { dismiss() } + viewModel.getAudioContentOrderList(orderType = OrderType.KEEP) { dismiss() } } override fun onDismiss(dialog: DialogInterface) { @@ -139,7 +140,7 @@ class PlaylistAddContentDialogFragment( if (!recyclerView.canScrollVertically(1) && lastVisibleItemPosition == itemTotalCount ) { - viewModel.getAudioContentOrderList {} + viewModel.getAudioContentOrderList(orderType = OrderType.KEEP) {} } } })