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 4373f32..6989bef 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 @@ -161,6 +161,7 @@ interface AudioContentApi { @GET("/audio-content/main/new/all") fun getNewContentAllOfTheme( + @Query("isFree") isFree: Boolean, @Query("theme") theme: String, @Query("isAdultContentVisible") isAdultContentVisible: Boolean, @Query("contentType") contentType: ContentType, @@ -333,4 +334,12 @@ interface AudioContentApi { @Query("size") size: Int, @Header("Authorization") authHeader: String ): Single>> + + @GET("/v2/audio-content/main/free/new-content-by-theme") + fun getNewFreeContentOfTheme( + @Query("theme") theme: String, + @Query("page") page: Int, + @Query("size") size: Int, + @Header("Authorization") authHeader: String + ): Single>> } 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 e737127..fe645a7 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 @@ -147,11 +147,13 @@ class AudioContentRepository( ) fun getNewContentAllOfTheme( + isFree: Boolean, theme: String, page: Int, size: Int, token: String ) = api.getNewContentAllOfTheme( + isFree = isFree, theme = theme, isAdultContentVisible = SharedPreferenceManager.isAdultContentVisible, contentType = ContentType.values()[SharedPreferenceManager.contentPreference], diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllActivity.kt index a64d465..7e7f0d3 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllActivity.kt @@ -5,6 +5,8 @@ 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 @@ -19,6 +21,7 @@ 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 AudioContentNewAllActivity : BaseActivity( ActivityAudioContentNewAllBinding::inflate ) { @@ -29,12 +32,15 @@ class AudioContentNewAllActivity : BaseActivity( ActivityAudioContentCurationBinding::inflate ) { diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/v2/free/AudioContentMainTabFreeFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/v2/free/AudioContentMainTabFreeFragment.kt index 47b3929..e62dbd7 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/v2/free/AudioContentMainTabFreeFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/v2/free/AudioContentMainTabFreeFragment.kt @@ -290,7 +290,9 @@ class AudioContentMainTabFreeFragment : BaseFragment Logger.e(message) } + _toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.") + _isLoading.value = false + } + ) + ) + } }