#91 댓글 나오는 로직 수정

pknu-wap · Jun 8, 2023 · 0046760 · 0046760
1 parent cdc91c6
commit 0046760
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.../com/android/mediproject/feature/comments/commentsofamedicine/MedicineCommentsFragment.kt b/.../com/android/mediproject/feature/comments/commentsofamedicine/MedicineCommentsFragment.kt
@@ -92,7 +92,7 @@ class MedicineCommentsFragment :
 
                             is CommentActionState.COMPLETED_LIKE -> {
                                 action.result.fold(onSuccess = {
-                                    adapter.retry()
+                                    adapter.refresh()
                                 }, onFailure = {
                                     toast(it.message.toString())
                                 })
@@ -103,15 +103,15 @@ class MedicineCommentsFragment :
                                 action.result.fold(onSuccess = {
                                     replyHeader.isVisible = false
                                     toast(getString(R.string.appliedComment))
-                                    adapter.retry()
+                                    adapter.refresh()
                                 }, onFailure = {
                                     toast(it.message.toString())
                                 })
                             }
 
                             is CommentActionState.COMPLETED_APPLY_EDITED_COMMENT -> {
                                 action.result.fold(onSuccess = {
-                                    adapter.retry()
+                                    adapter.refresh()
                                     toast(getString(R.string.appliedEditComment))
                                 }, onFailure = {
                                     toast(it.message.toString())
@@ -120,7 +120,7 @@ class MedicineCommentsFragment :
 
                             is CommentActionState.COMPLETED_DELETE_COMMENT -> {
                                 action.result.fold(onSuccess = {
-                                    adapter.retry()
+                                    adapter.refresh()
                                     toast(getString(R.string.deletedComment))
                                 }, onFailure = {
                                     toast(it.message.toString())

diff --git a/...com/android/mediproject/feature/comments/commentsofamedicine/MedicineCommentsViewModel.kt b/...com/android/mediproject/feature/comments/commentsofamedicine/MedicineCommentsViewModel.kt
@@ -29,7 +29,6 @@ import com.android.mediproject.feature.comments.commentsofamedicine.CommentActio
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.channels.BufferOverflow
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharedFlow
@@ -113,7 +112,6 @@ class MedicineCommentsViewModel @Inject constructor(
                 subOrdinationId = replyId.value.toString())).collectLatest { result ->
                 result.onSuccess {
                     // 댓글 등록 성공
-                    delay(200)
                     commentsUseCase.scrollChannel.send(Unit)
                     _action.emit(CommentActionState.COMPLETED_APPLY_COMMENT_REPLY(Result.success(Unit)))
                 }.onFailure {
@@ -134,7 +132,6 @@ class MedicineCommentsViewModel @Inject constructor(
                 subOrdinationId = "0")).collectLatest { result ->
                 result.onSuccess {
                     // 댓글 등록 성공
-                    delay(200)
                     commentsUseCase.scrollChannel.send(Unit)
                     _action.emit(CommentActionState.COMPLETED_APPLY_COMMENT_REPLY(Result.success(Unit)))
                 }.onFailure {
@@ -156,7 +153,6 @@ class MedicineCommentsViewModel @Inject constructor(
                 medicineId = medicineBasicInfo.replayCache.last().medicineIdInAws)).collectLatest { result ->
                 result.onSuccess {
                     // 댓글 수정 성공
-                    delay(200)
                     _action.emit(CommentActionState.COMPLETED_APPLY_EDITED_COMMENT(Result.success(Unit)))
                 }.onFailure {
                     _action.emit(CommentActionState.COMPLETED_APPLY_EDITED_COMMENT(Result.failure(it)))
@@ -201,7 +197,6 @@ class MedicineCommentsViewModel @Inject constructor(
                 .collectLatest { result ->
                     result.onSuccess {
                         // 댓글 삭제 성공
-                        delay(200)
                         commentsUseCase.scrollChannel.send(Unit)
                         _action.emit(CommentActionState.COMPLETED_DELETE_COMMENT(Result.success(Unit)))
                     }.onFailure {
@@ -223,7 +218,6 @@ class MedicineCommentsViewModel @Inject constructor(
                 .collectLatest { result ->
                     result.onSuccess {
                         // like 처리 완료
-                        delay(200)
                         _action.emit(CommentActionState.COMPLETED_LIKE(Result.success(Unit)))
                     }.onFailure {
                         _action.emit(CommentActionState.COMPLETED_LIKE(Result.failure(it)))

diff --git a/feature/search/src/main/res/layout/manual_medicine_item.xml b/feature/search/src/main/res/layout/manual_medicine_item.xml
@@ -18,10 +18,9 @@
 
         <ImageView
             android:id="@+id/medicineImgView"
-            android:src="@drawable/logo"
             android:layout_width="60dp"
             android:layout_height="60dp"
-            android:background="@drawable/circle_image_background"
+            app:img="@{item.imgUrl}"
             android:contentDescription="@string/medicineImage"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"