From 20b627202eb100b5d64b523e00a28feeee09b8ca Mon Sep 17 00:00:00 2001 From: klaus Date: Wed, 8 Jan 2025 00:53:54 +0900 Subject: [PATCH] =?UTF-8?q?=EC=98=A4=EB=94=94=EC=85=98,=20=EC=98=A4?= =?UTF-8?q?=EB=94=94=EC=85=98=20=EC=83=81=EC=84=B8=20-=20=EC=98=A4?= =?UTF-8?q?=EB=94=94=EC=85=98=20=EB=A6=AC=EC=8A=A4=ED=8A=B8,=20=EC=98=A4?= =?UTF-8?q?=EB=94=94=EC=85=98=20=EC=BA=90=EB=A6=AD=ED=84=B0=20=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=95=84=EC=9D=B4=ED=85=9C=20=EC=82=AC?= =?UTF-8?q?=EC=9D=B4=20=EA=B0=84=EA=B2=A9=2016.7=20->=2025=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 +- .../sodalive/audition/AuditionFragment.kt | 8 +- .../audition/detail/AuditionDetailActivity.kt | 8 +- .../role/AuditionRoleDetailViewModel.kt | 82 ++++++++++--------- .../item_audition_list_completed_header.xml | 2 +- 5 files changed, 53 insertions(+), 51 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a58b601..7051f5a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,8 +35,8 @@ android { applicationId "kr.co.vividnext.sodalive" minSdk 23 targetSdk 34 - versionCode 131 - versionName "1.25.0" + versionCode 132 + versionName "1.26.0" } buildTypes { diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audition/AuditionFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/audition/AuditionFragment.kt index a77b4a5..e821cc9 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audition/AuditionFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audition/AuditionFragment.kt @@ -62,17 +62,17 @@ class AuditionFragment : BaseFragment( when (parent.getChildAdapterPosition(view)) { 0 -> { outRect.top = 0 - outRect.bottom = 8.3f.dpToPx().toInt() + outRect.bottom = 12.5f.dpToPx().toInt() } adapter.itemCount - 1 -> { - outRect.top = 8.3f.dpToPx().toInt() + outRect.top = 12.5f.dpToPx().toInt() outRect.bottom = 0 } else -> { - outRect.top = 8.3f.dpToPx().toInt() - outRect.bottom = 8.3f.dpToPx().toInt() + outRect.top = 12.5f.dpToPx().toInt() + outRect.bottom = 12.5f.dpToPx().toInt() } } } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audition/detail/AuditionDetailActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audition/detail/AuditionDetailActivity.kt index 91ddf1f..7fdc86a 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audition/detail/AuditionDetailActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audition/detail/AuditionDetailActivity.kt @@ -105,17 +105,17 @@ class AuditionDetailActivity : BaseActivity( when (parent.getChildAdapterPosition(view)) { 0 -> { outRect.top = 0 - outRect.bottom = 7.5f.dpToPx().toInt() + outRect.bottom = 12.5f.dpToPx().toInt() } adapter.itemCount - 1 -> { - outRect.top = 7.5f.dpToPx().toInt() + outRect.top = 12.5f.dpToPx().toInt() outRect.bottom = 0 } else -> { - outRect.top = 7.5f.dpToPx().toInt() - outRect.bottom = 7.5f.dpToPx().toInt() + outRect.top = 12.5f.dpToPx().toInt() + outRect.bottom = 12.5f.dpToPx().toInt() } } } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audition/role/AuditionRoleDetailViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/audition/role/AuditionRoleDetailViewModel.kt index ca76eac..b633c9b 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audition/role/AuditionRoleDetailViewModel.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audition/role/AuditionRoleDetailViewModel.kt @@ -138,48 +138,50 @@ class AuditionRoleDetailViewModel(private val repository: AuditionRepository) : } fun getAuditionApplicantList() { - _isLoading.value = true + if (!_isLoading.value!! && !isLast) { + _isLoading.value = true - compositeDisposable.add( - repository.getAuditionApplicantList( - auditionRoleId = auditionRoleId, - sortType = _sortTypeLiveData.value!!, - page = page, - size = pageSize, - token = "Bearer ${SharedPreferenceManager.token}" - ) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe( - { - if (it.success && it.data != null) { - val data = it.data - - _totalCountLiveData.value = data.totalCount - addApplicantList(data.items) - - if (data.items.isEmpty()) { - isLast = true - } else { - page += 1 - } - } else { - if (it.message != null) { - _toastLiveData.value = it.message - } else { - _toastLiveData.value = "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요." - } - } - - _isLoading.value = false - }, - { - _isLoading.value = false - it.message?.let { message -> Logger.e(message) } - _toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.") - } + compositeDisposable.add( + repository.getAuditionApplicantList( + auditionRoleId = auditionRoleId, + sortType = _sortTypeLiveData.value!!, + page = page, + size = pageSize, + token = "Bearer ${SharedPreferenceManager.token}" ) - ) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe( + { + if (it.success && it.data != null) { + val data = it.data + + _totalCountLiveData.value = data.totalCount + addApplicantList(data.items) + + if (data.items.isEmpty()) { + isLast = true + } else { + page += 1 + } + } else { + if (it.message != null) { + _toastLiveData.value = it.message + } else { + _toastLiveData.value = "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요." + } + } + + _isLoading.value = false + }, + { + _isLoading.value = false + it.message?.let { message -> Logger.e(message) } + _toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.") + } + ) + ) + } } fun applyAudition(auditionRoleId: Long, phoneNumber: String, onSuccess: () -> Unit) { diff --git a/app/src/main/res/layout/item_audition_list_completed_header.xml b/app/src/main/res/layout/item_audition_list_completed_header.xml index cc37c67..b802c21 100644 --- a/app/src/main/res/layout/item_audition_list_completed_header.xml +++ b/app/src/main/res/layout/item_audition_list_completed_header.xml @@ -9,7 +9,7 @@ android:id="@+id/divider" android:layout_width="0dp" android:layout_height="6.7dp" - android:layout_marginTop="13.3dp" + android:layout_marginTop="5dp" android:background="@color/color_232323" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"