parent
6fbe7da71e
commit
326ad01983
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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}"
|
||||
|
|
|
@ -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) {}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
|
Loading…
Reference in New Issue