From f3553c3c595e005476e0815940c62d4a0f16f183 Mon Sep 17 00:00:00 2001 From: klaus Date: Thu, 10 Oct 2024 13:36:33 +0900 Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C,=20=EC=BD=98?= =?UTF-8?q?=ED=85=90=EC=B8=A0=20=EB=A9=94=EC=9D=B8=20-=20=EC=83=88?= =?UTF-8?q?=EB=A1=9C=EC=9A=B4=20=EC=BD=98=ED=85=90=EC=B8=A0,=20=ED=81=90?= =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=85=98=20-=20=EB=AF=BC=EA=B0=90=ED=95=9C?= =?UTF-8?q?=20=EC=BD=98=ED=85=90=EC=B8=A0(19=EA=B8=88)=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vividnext/sodalive/audio_content/AudioContentApi.kt | 7 +++++++ .../sodalive/audio_content/AudioContentRepository.kt | 8 ++++++++ .../main/java/kr/co/vividnext/sodalive/live/LiveApi.kt | 2 ++ .../java/kr/co/vividnext/sodalive/live/LiveRepository.kt | 2 ++ 4 files changed, 19 insertions(+) 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 59f06ad..5ca6c67 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 @@ -21,6 +21,7 @@ import kr.co.vividnext.sodalive.audio_content.order.OrderRequest 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 +import kr.co.vividnext.sodalive.settings.ContentType import okhttp3.MultipartBody import okhttp3.RequestBody import retrofit2.http.Body @@ -141,12 +142,16 @@ interface AudioContentApi { @GET("/audio-content/main/new") fun getNewContentOfTheme( @Query("theme") theme: String, + @Query("isAdultContentVisible") isAdultContentVisible: Boolean, + @Query("contentType") contentType: ContentType, @Header("Authorization") authHeader: String ): Single>> @GET("/audio-content/main/new/all") fun getNewContentAllOfTheme( @Query("theme") theme: String, + @Query("isAdultContentVisible") isAdultContentVisible: Boolean, + @Query("contentType") contentType: ContentType, @Query("page") page: Int, @Query("size") size: Int, @Header("Authorization") authHeader: String @@ -193,6 +198,8 @@ interface AudioContentApi { @GET("/audio-content/main/curation-list") fun getCurationList( + @Query("isAdultContentVisible") isAdultContentVisible: Boolean, + @Query("contentType") contentType: ContentType, @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 e8c7e22..3d6d4aa 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 @@ -5,6 +5,8 @@ import kr.co.vividnext.sodalive.audio_content.detail.PutAudioContentLikeRequest import kr.co.vividnext.sodalive.audio_content.donation.AudioContentDonationRequest import kr.co.vividnext.sodalive.audio_content.order.OrderRequest import kr.co.vividnext.sodalive.audio_content.order.OrderType +import kr.co.vividnext.sodalive.common.SharedPreferenceManager +import kr.co.vividnext.sodalive.settings.ContentType import kr.co.vividnext.sodalive.user.CreatorFollowRequestRequest import kr.co.vividnext.sodalive.user.UserApi import okhttp3.MultipartBody @@ -135,6 +137,8 @@ class AudioContentRepository( fun getNewContentOfTheme(theme: String, token: String) = api.getNewContentOfTheme( theme = theme, + isAdultContentVisible = SharedPreferenceManager.isAdultContentVisible, + contentType = ContentType.values()[SharedPreferenceManager.contentPreference], authHeader = token ) @@ -145,6 +149,8 @@ class AudioContentRepository( token: String ) = api.getNewContentAllOfTheme( theme = theme, + isAdultContentVisible = SharedPreferenceManager.isAdultContentVisible, + contentType = ContentType.values()[SharedPreferenceManager.contentPreference], page = page - 1, size = size, authHeader = token @@ -181,6 +187,8 @@ class AudioContentRepository( ) fun getCurationList(page: Int, size: Int, token: String) = api.getCurationList( + isAdultContentVisible = SharedPreferenceManager.isAdultContentVisible, + contentType = ContentType.values()[SharedPreferenceManager.contentPreference], page = page - 1, size = size, authHeader = token diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/LiveApi.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/LiveApi.kt index 6afd2dd..17938bb 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/LiveApi.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/LiveApi.kt @@ -26,6 +26,7 @@ import kr.co.vividnext.sodalive.live.room.info.GetRoomInfoResponse import kr.co.vividnext.sodalive.live.room.kick_out.LiveRoomKickOutRequest import kr.co.vividnext.sodalive.live.room.profile.GetLiveRoomUserProfileResponse import kr.co.vividnext.sodalive.live.room.tag.GetLiveTagResponse +import kr.co.vividnext.sodalive.settings.ContentType import okhttp3.MultipartBody import okhttp3.RequestBody import retrofit2.http.Body @@ -50,6 +51,7 @@ interface LiveApi { @Query("timezone") timezone: String, @Query("dateString") dateString: String?, @Query("status") status: LiveRoomStatus, + @Query("isAdultContentVisible") isAdultContentVisible: Boolean, @Query("page") page: Int, @Query("size") size: Int, @Header("Authorization") authHeader: String diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/LiveRepository.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/LiveRepository.kt index e032c60..1add11c 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/LiveRepository.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/LiveRepository.kt @@ -3,6 +3,7 @@ package kr.co.vividnext.sodalive.live import io.reactivex.rxjava3.core.Flowable import io.reactivex.rxjava3.core.Single import kr.co.vividnext.sodalive.common.ApiResponse +import kr.co.vividnext.sodalive.common.SharedPreferenceManager import kr.co.vividnext.sodalive.live.reservation.MakeLiveReservationRequest import kr.co.vividnext.sodalive.live.reservation_status.CancelLiveReservationRequest import kr.co.vividnext.sodalive.live.room.CancelLiveRequest @@ -39,6 +40,7 @@ class LiveRepository( timezone = TimeZone.getDefault().id, dateString = dateString, status = status, + isAdultContentVisible = SharedPreferenceManager.isAdultContentVisible, page = page - 1, size = size, authHeader = token