[FEAT] 읽음여부 표시

#68
POLZZAK · Sep 15, 2023 · e22de39 · e22de39
1 parent b4e9bc9
commit e22de39
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/.../main/java/com/polzzak_android/presentation/feature/notification/NotificationViewModel.kt b/.../main/java/com/polzzak_android/presentation/feature/notification/NotificationViewModel.kt
@@ -111,6 +111,7 @@ class NotificationViewModel @AssistedInject constructor(
                 _notificationLiveData.value =
                     ModelState.Loading(prevData.copy(isRefreshable = true))
                 notificationMutex.unlock()
+                notificationHorizontalScrollPositionMap.clear()
                 requestNotifications(accessToken = accessToken)
             },
         )
@@ -352,8 +353,8 @@ private fun getMockNotifications(nextId: Int?, pageSize: Int = 10) = ApiResult.s
 private val mockNotifications = List(187) {
     NotificationDto(
         id = it,
-        type = "FAMILY_REQUEST",
-        status = "UNREAD",
+        type = "FAMILY_REQUEST_COMPLETE",
+        status = if (it % 2 == 0) "READ" else "UNREAD",
         title = "title$it",
         message = "message$it",
         sender = NotificationDto.Sender(id = it, nickName = "nickName$it", null),

diff --git a/...lzzak_android/presentation/feature/notification/list/base/BaseNotificationListFragment.kt b/...lzzak_android/presentation/feature/notification/list/base/BaseNotificationListFragment.kt
@@ -104,12 +104,9 @@ abstract class BaseNotificationListFragment : BaseFragment<FragmentNotificationL
 
     private fun initNotificationObserver() {
         notificationViewModel.notificationLiveData.observe(viewLifecycleOwner) {
-            val layoutManager =
-                (binding.rvNotifications.layoutManager as? LinearLayoutManager) ?: return@observe
             val adapter =
                 (binding.rvNotifications.adapter as? BindableItemAdapter) ?: return@observe
             val items = mutableListOf<BindableItem<*>>()
-            var updateCallback: (() -> Unit)? = null
             binding.srlNotifications.isEnabled = it.data?.isRefreshable ?: false
             when (it) {
                 is ModelState.Loading -> {
@@ -128,19 +125,14 @@ abstract class BaseNotificationListFragment : BaseFragment<FragmentNotificationL
                 is ModelState.Success -> {
                     items.addAll(createNotificationItems(data = it.data.items))
                     binding.srlNotifications.isRefreshing = false
-                    if (notificationViewModel.isRefreshed) {
-                        updateCallback = {
-                            layoutManager.scrollToPositionWithOffset(1, 0)
-                        }
-                    }
                 }
 
                 is ModelState.Error -> {
                     //TODO 에러처리
                 }
             }
 
-            adapter.updateItem(item = items, commitCallback = updateCallback)
+            adapter.updateItem(item = items)
         }
     }
 

diff --git a/.../java/com/polzzak_android/presentation/feature/notification/list/item/NotificationItem.kt b/.../java/com/polzzak_android/presentation/feature/notification/list/item/NotificationItem.kt
@@ -40,7 +40,7 @@ class NotificationItem(
             ivBtnRemoveNotification.setOnClickListener {
                 clickListener.onClickDeleteNotification(id = model.id)
             }
-
+            ivIconUnRead.isVisible = model.statusType == NotificationStatusType.UNREAD
             bindBtnLayout(binding = binding)
             bindProfile(binding = binding)
             bindHorizontalScroll(binding = binding)

diff --git a/app/src/main/res/layout/item_notification.xml b/app/src/main/res/layout/item_notification.xml
@@ -65,6 +65,14 @@
                     app:layout_constraintTop_toTopOf="@id/tvTitle"
                     tools:text="방금 전" />
 
+                <ImageView
+                    android:id="@+id/ivIconUnRead"
+                    android:layout_width="6dp"
+                    android:layout_height="6dp"
+                    android:background="@drawable/shape_oval_error_500"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
                 <TextView
                     android:id="@+id/tvContent"
                     android:layout_width="0dp"