From 2ed77a33327ee737d283edbb50301ad40ec392ae Mon Sep 17 00:00:00 2001 From: klaus Date: Fri, 20 Sep 2024 11:44:13 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=EC=83=81?= =?UTF-8?q?=EC=84=B8=20-=20=ED=81=AC=EB=A6=AC=EC=97=90=EC=9D=B4=ED=84=B0?= =?UTF-8?q?=20=ED=8C=94=EB=A1=9C=EC=9A=B0=EC=99=80=20=EC=95=8C=EB=A6=BC?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20-=20=ED=8C=94=EB=A1=9C=EC=9E=89=20?= =?UTF-8?q?=EC=83=81=ED=83=9C=EC=97=90=EC=84=9C=20=EC=95=8C=EB=A6=BC=20?= =?UTF-8?q?=EC=BC=9C=EA=B8=B0/=EB=81=84=EA=B8=B0=20=EC=83=81=ED=83=9C=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail/AudioContentDetailActivity.kt | 48 +++++++++++++++---- .../detail/AudioContentDetailViewModel.kt | 37 ++++++++++++++ .../java/kr/co/vividnext/sodalive/di/AppDI.kt | 2 +- .../following/FollowingCreatorViewModel.kt | 1 + 4 files changed, 78 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt index b9d63b6..1fdc5c8 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt @@ -42,6 +42,7 @@ import kr.co.vividnext.sodalive.common.LoadingDialog import kr.co.vividnext.sodalive.common.SharedPreferenceManager import kr.co.vividnext.sodalive.common.Utils import kr.co.vividnext.sodalive.databinding.ActivityAudioContentDetailBinding +import kr.co.vividnext.sodalive.explorer.profile.CreatorFollowNotifyFragment import kr.co.vividnext.sodalive.explorer.profile.UserProfileActivity import kr.co.vividnext.sodalive.extensions.dpToPx import kr.co.vividnext.sodalive.extensions.moneyFormat @@ -843,21 +844,50 @@ class AudioContentDetailActivity : BaseActivity Logger.e(message) } + _toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.") + } + ) + ) + } + fun registerNotification(contentId: Long, creatorId: Long) { isLoading.value = true compositeDisposable.add( 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 461ae51..454680a 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 @@ -237,7 +237,7 @@ class AppDI(private val context: Context, isDebugMode: Boolean) { viewModel { AudioContentUploadViewModel(get()) } viewModel { AudioContentModifyViewModel(get()) } viewModel { AudioContentThemeViewModel(get()) } - viewModel { AudioContentDetailViewModel(get(), get(), get(), get()) } + viewModel { AudioContentDetailViewModel(get(), get(), get(), get(), get()) } viewModel { AudioContentCommentListViewModel(get()) } viewModel { AudioContentCommentReplyViewModel(get()) } viewModel { FollowingCreatorViewModel(get(), get()) } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/following/FollowingCreatorViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/following/FollowingCreatorViewModel.kt index 40e4d3b..37d0db5 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/following/FollowingCreatorViewModel.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/following/FollowingCreatorViewModel.kt @@ -82,6 +82,7 @@ class FollowingCreatorViewModel( } fun follow(creatorId: Long, follow: Boolean = true, notify: Boolean = true) { + _isLoading.value = true compositeDisposable.add( userRepository.creatorFollow( creatorId = creatorId,