From 68a777c8df7434213632966da26a7941a23e915e Mon Sep 17 00:00:00 2001 From: klaus Date: Wed, 19 Mar 2025 22:32:41 +0900 Subject: [PATCH] =?UTF-8?q?=EC=8B=9C=EB=A6=AC=EC=A6=88=20=EC=83=81?= =?UTF-8?q?=EC=84=B8,=20=EC=8B=9C=EB=A6=AC=EC=A6=88=20=EB=A6=AC=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8,=20=EC=8B=9C=EB=A6=AC=EC=A6=88=20=EC=A0=84=EC=B2=B4?= =?UTF-8?q?=ED=9A=8C=EC=B0=A8=20=EB=93=A3=EA=B8=B0=20-=2019=EA=B8=88=20?= =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=EB=B3=B4=EA=B8=B0=20=EC=97=AC?= =?UTF-8?q?=EB=B6=80=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../audio_content/AudioContentRepository.kt | 19 ------------------- .../audio_content/series/SeriesApi.kt | 4 ++++ .../audio_content/series/SeriesRepository.kt | 4 ++++ .../java/kr/co/vividnext/sodalive/di/AppDI.kt | 2 +- 4 files changed, 9 insertions(+), 20 deletions(-) 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 d468adb..02d6e44 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 @@ -8,15 +8,12 @@ import kr.co.vividnext.sodalive.audio_content.order.OrderType import kr.co.vividnext.sodalive.common.SharedPreferenceManager import kr.co.vividnext.sodalive.explorer.ExplorerApi import kr.co.vividnext.sodalive.settings.ContentType -import kr.co.vividnext.sodalive.user.CreatorFollowRequestRequest -import kr.co.vividnext.sodalive.user.UserApi import okhttp3.MultipartBody import okhttp3.RequestBody import java.util.TimeZone class AudioContentRepository( private val api: AudioContentApi, - private val userApi: UserApi, private val categoryApi: CategoryApi, private val explorerApi: ExplorerApi ) { @@ -91,22 +88,6 @@ class AudioContentRepository( authHeader = token ) - fun registerNotification( - creatorId: Long, - token: String - ) = userApi.creatorFollow( - request = CreatorFollowRequestRequest(creatorId = creatorId), - authHeader = token - ) - - fun unRegisterNotification( - creatorId: Long, - token: String - ) = userApi.creatorUnFollow( - request = CreatorFollowRequestRequest(creatorId = creatorId), - authHeader = token - ) - fun orderContent( contentId: Long, orderType: OrderType, 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 2135bc1..b119658 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 @@ -15,6 +15,8 @@ interface SeriesApi { fun getSeriesList( @Query("creatorId") creatorId: Long, @Query("sortType") sortType: SeriesListAllViewModel.SeriesSortType, + @Query("isAdultContentVisible") isAdultContentVisible: Boolean, + @Query("contentType") contentType: ContentType, @Query("page") page: Int, @Query("size") size: Int, @Header("Authorization") authHeader: String @@ -23,12 +25,14 @@ interface SeriesApi { @GET("/audio-content/series/{id}") fun getSeriesDetail( @Path("id") seriesId: Long, + @Query("isAdultContentVisible") isAdultContentVisible: Boolean, @Header("Authorization") authHeader: String ): Single> @GET("/audio-content/series/{id}/content") fun getSeriesContentList( @Path("id") seriesId: Long, + @Query("isAdultContentVisible") isAdultContentVisible: Boolean, @Query("page") page: Int, @Query("size") size: Int, @Query("sortType") sortType: SeriesListAllViewModel.SeriesSortType, 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 19accf8..38e492f 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 @@ -13,6 +13,8 @@ class SeriesRepository(private val api: SeriesApi) { ) = api.getSeriesList( creatorId = creatorId, sortType = sortType, + isAdultContentVisible = SharedPreferenceManager.isAdultContentVisible, + contentType = ContentType.values()[SharedPreferenceManager.contentPreference], page = page - 1, size = size, authHeader = token @@ -20,6 +22,7 @@ class SeriesRepository(private val api: SeriesApi) { fun getSeriesDetail(seriesId: Long, token: String) = api.getSeriesDetail( seriesId = seriesId, + isAdultContentVisible = SharedPreferenceManager.isAdultContentVisible, authHeader = token ) @@ -31,6 +34,7 @@ class SeriesRepository(private val api: SeriesApi) { token: String ) = api.getSeriesContentList( seriesId = seriesId, + isAdultContentVisible = SharedPreferenceManager.isAdultContentVisible, page = page - 1, size = size, sortType = sortType, diff --git a/app/src/main/java/kr/co/vividnext/sodalive/di/AppDI.kt b/app/src/main/java/kr/co/vividnext/sodalive/di/AppDI.kt index d097972..701136e 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/di/AppDI.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/di/AppDI.kt @@ -337,7 +337,7 @@ class AppDI(private val context: Context, isDebugMode: Boolean) { factory { ExplorerRepository(get()) } factory { MessageRepository(get()) } factory { NoticeRepository(get()) } - factory { AudioContentRepository(get(), get(), get(), get()) } + factory { AudioContentRepository(get(), get(), get()) } factory { AudioContentCommentRepository(get()) } factory { PlaybackTrackingRepository(get()) } factory { FollowingCreatorRepository(get()) }