From 90ff8ceb721ebb4f691c1e013f8b50ce3075ac52 Mon Sep 17 00:00:00 2001 From: klaus Date: Mon, 14 Oct 2024 01:34:35 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20-=20=EC=B6=94=EC=B2=9C=EC=8B=9C=EB=A6=AC=EC=A6=88,?= =?UTF-8?q?=20=EB=AA=A8=EB=8B=9D=EC=BD=9C,=20=EC=88=8F=ED=94=8C,=20?= =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EB=8B=A4=EC=8B=9C=EB=B3=B4?= =?UTF-8?q?=EA=B8=B0=20-=20=EB=82=A8=EC=84=B1=ED=96=A5=EC=9D=B4=EB=A9=B4?= =?UTF-8?q?=20=EC=97=AC=EC=84=B1=20=ED=81=AC=EB=A6=AC=EC=97=90=EC=9D=B4?= =?UTF-8?q?=ED=84=B0,=20=EC=97=AC=EC=84=B1=ED=96=A5=EC=9D=B4=EB=A9=B4=20?= =?UTF-8?q?=EB=82=A8=EC=84=B1=20=ED=81=AC=EB=A6=AC=EC=97=90=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=20=EC=9E=91=ED=92=88=EB=A7=8C=20=EC=A1=B0=ED=9A=8C?= =?UTF-8?q?=EB=90=98=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 --- .../vividnext/sodalive/audio_content/AudioContentApi.kt | 2 ++ .../sodalive/audio_content/AudioContentRepository.kt | 2 ++ .../vividnext/sodalive/audio_content/series/SeriesApi.kt | 3 +++ .../sodalive/audio_content/series/SeriesRepository.kt | 9 ++++++++- 4 files changed, 15 insertions(+), 1 deletion(-) 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 5ca6c67..4f15623 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 @@ -54,6 +54,8 @@ interface AudioContentApi { @GET("/audio-content/theme/{id}/content") fun getAudioContentByTheme( @Path("id") id: Long, + @Query("isAdultContentVisible") isAdultContentVisible: Boolean, + @Query("contentType") contentType: ContentType, @Query("page") page: Int, @Query("size") size: Int, @Query("sort-type") sort: AudioContentViewModel.Sort, 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 3d6d4aa..6f35ec5 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 @@ -223,6 +223,8 @@ class AudioContentRepository( token: String ) = api.getAudioContentByTheme( id = themeId, + isAdultContentVisible = SharedPreferenceManager.isAdultContentVisible, + contentType = ContentType.values()[SharedPreferenceManager.contentPreference], page = page - 1, size = size, sort = sort, diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/SeriesApi.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/SeriesApi.kt index cdff15b..2135bc1 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/SeriesApi.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/SeriesApi.kt @@ -4,6 +4,7 @@ import io.reactivex.rxjava3.core.Single import kr.co.vividnext.sodalive.audio_content.series.detail.GetSeriesContentListResponse import kr.co.vividnext.sodalive.audio_content.series.detail.GetSeriesDetailResponse import kr.co.vividnext.sodalive.common.ApiResponse +import kr.co.vividnext.sodalive.settings.ContentType import retrofit2.http.GET import retrofit2.http.Header import retrofit2.http.Path @@ -36,6 +37,8 @@ interface SeriesApi { @GET("/audio-content/series/recommend") fun getRecommendSeriesList( + @Query("isAdultContentVisible") isAdultContentVisible: Boolean, + @Query("contentType") contentType: ContentType, @Header("Authorization") authHeader: String ): Single>> } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/SeriesRepository.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/SeriesRepository.kt index fdc5f7a..19accf8 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/SeriesRepository.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/SeriesRepository.kt @@ -1,5 +1,8 @@ package kr.co.vividnext.sodalive.audio_content.series +import kr.co.vividnext.sodalive.common.SharedPreferenceManager +import kr.co.vividnext.sodalive.settings.ContentType + class SeriesRepository(private val api: SeriesApi) { fun getSeriesList( creatorId: Long, @@ -34,5 +37,9 @@ class SeriesRepository(private val api: SeriesApi) { authHeader = token ) - fun getRecommendSeriesList(token: String) = api.getRecommendSeriesList(authHeader = token) + fun getRecommendSeriesList(token: String) = api.getRecommendSeriesList( + isAdultContentVisible = SharedPreferenceManager.isAdultContentVisible, + contentType = ContentType.values()[SharedPreferenceManager.contentPreference], + authHeader = token + ) }