Fix/alarm page bookmark bugfix (#51)

* 🔨 알림 페이지 즐겨찾기 토스트 메시지 수정 * 🔨 알림 GET 요청 URL 수정 * 🔨 즐겨찾기 페이지 구분선 로딩 부자연스러운 문제 해결 * 🔨 MyPageFragment 코드 리팩토링
Team-Never-Land · Oct 12, 2024 · 014b427 · 014b427
1 parent 9e2cfe1
commit 014b427
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 35 deletions.
diff --git a/ThinkerBell/data/src/main/java/com/neverland/data/remote/service/AlarmService.kt b/ThinkerBell/data/src/main/java/com/neverland/data/remote/service/AlarmService.kt
@@ -13,7 +13,7 @@ interface AlarmService {
         @Query("alarmId") alarmId: Int
     ): Response<BaseResponse<String>>
 
-    @GET("/api/alarm/get")
+    @GET("/api/alarm")
     suspend fun getAlarm(
         @Query("SSAID") ssaId: String,
         @Query("keyword") keyword: String

diff --git a/...l/presentation/src/main/java/com/neverland/thinkerbell/view/alarm/AlarmNoticeViewModel.kt b/...l/presentation/src/main/java/com/neverland/thinkerbell/view/alarm/AlarmNoticeViewModel.kt
@@ -72,12 +72,12 @@ class AlarmNoticeViewModel @Inject constructor(
                 noticeId = noticeId
             )
                 .onFailure {
-                    LoggerUtil.e("[${category.koName}] 북마크 실패: ${it.message}")
-                    _bookmarkState.value = UiState.Success("북마크 실패")
+                    LoggerUtil.e("[${category.koName}] 즐겨찾기 실패: ${it.message}")
+                    _bookmarkState.value = UiState.Success("즐겨찾기 실패")
                 }
                 .onSuccess {
-                    LoggerUtil.d("[${category.koName}] 북마크 성공")
-                    _bookmarkState.value = UiState.Success("북마크 성공")
+                    LoggerUtil.d("[${category.koName}] 즐겨찾기 성공")
+                    _bookmarkState.value = UiState.Success("즐겨찾기 되었습니다")
                 }
 
         }
@@ -92,12 +92,12 @@ class AlarmNoticeViewModel @Inject constructor(
                 noticeId = noticeId
             )
                 .onFailure {
-                    LoggerUtil.e("[${category.koName}] 북마크 삭제 실패: ${it.message}")
-                    _bookmarkState.value = UiState.Success("북마크 삭제 실패")
+                    LoggerUtil.e("[${category.koName}] 즐겨찾기 삭제 실패: ${it.message}")
+                    _bookmarkState.value = UiState.Success("즐겨찾기 삭제 실패")
                 }
                 .onSuccess {
-                    LoggerUtil.d("[${category.koName}] 북마크 삭제 성공")
-                    _bookmarkState.value = UiState.Success("북마크 삭제 성공")
+                    LoggerUtil.d("[${category.koName}] 즐겨찾기 삭제 성공")
+                    _bookmarkState.value = UiState.Success("삭제 되었습니다")
                 }
         }
     }

diff --git a/...erBell/presentation/src/main/java/com/neverland/thinkerbell/view/myPage/MyPageFragment.kt b/...erBell/presentation/src/main/java/com/neverland/thinkerbell/view/myPage/MyPageFragment.kt
@@ -24,7 +24,7 @@ import dagger.hilt.android.AndroidEntryPoint
 @AndroidEntryPoint
 class MyPageFragment : BaseFragment<FragmentMyPageBinding>() {
 
-    private val myPageviewModel: MyPageViewModel by viewModels()
+    private val myPageViewModel: MyPageViewModel by viewModels()
     private lateinit var myPageFavoriteNoticeAdapter: MyPageFavoriteNoticeAdapter
     private lateinit var myPageFavoriteScheduleAdapter: MyPageFavoriteScheduleAdapter
 
@@ -51,7 +51,7 @@ class MyPageFragment : BaseFragment<FragmentMyPageBinding>() {
         super.setObserver()
 
         observeUiState(
-            myPageviewModel.recentFavoriteNotices,
+            myPageViewModel.recentFavoriteNotices,
             ::setupFavoriteNoticesRecyclerView,
             binding.rvMyPageFavoriteNotice,
             binding.ibPageRightNotices,
@@ -60,7 +60,7 @@ class MyPageFragment : BaseFragment<FragmentMyPageBinding>() {
         )
 
         observeUiState(
-            myPageviewModel.recentFavoriteSchedules,
+            myPageViewModel.recentFavoriteSchedules,
             ::setupFavoriteSchedulesRecyclerView,
             binding.rvMyPageFavoriteSchedule,
             binding.ibPageRightSchedules,
@@ -71,8 +71,8 @@ class MyPageFragment : BaseFragment<FragmentMyPageBinding>() {
 
     override fun onResume() {
         super.onResume()
-        myPageviewModel.fetchFavoriteNotices()
-        myPageviewModel.fetchFavoriteSchedules()
+        myPageViewModel.fetchFavoriteNotices()
+        myPageViewModel.fetchFavoriteSchedules()
     }
 
     private fun setupStatusBarAndNavigation() {
@@ -97,6 +97,8 @@ class MyPageFragment : BaseFragment<FragmentMyPageBinding>() {
                 }
                 is UiState.Success -> {
                     if (it.data.isNotEmpty()) {
+                        divider.visibility = View.VISIBLE
+                        emptyView.visibility = View.GONE
                         setupRecyclerView(it.data)
                     } else {
                         rightButton.isClickable = false
@@ -114,25 +116,6 @@ class MyPageFragment : BaseFragment<FragmentMyPageBinding>() {
         }
     }
 
-    private fun <T> setupRecyclerView(
-        list: List<T>,
-        adapter: RecyclerView.Adapter<*>,
-        recyclerView: RecyclerView
-    ) {
-        recyclerView.apply {
-            layoutManager = LinearLayoutManager(requireContext())
-            if (adapter is MyPageFavoriteScheduleAdapter) {
-                myPageFavoriteScheduleAdapter = adapter.apply {
-                    if (list.size >= 3) list.subList(0, 3) else list
-                }
-            } else if (adapter is MyPageFavoriteNoticeAdapter) {
-                myPageFavoriteNoticeAdapter = adapter.apply {
-                    if (list.size >= 3) list.subList(0, 3) else list
-                }
-            }
-        }
-    }
-
     private fun setupFavoriteNoticesRecyclerView(list: List<RecentBookmarkNotice>) {
         myPageFavoriteNoticeAdapter = MyPageFavoriteNoticeAdapter(if (list.size >= 3) list.subList(0, 3) else list).apply {
             setRvItemClickListener(object : OnRvItemClickListener<RecentBookmarkNotice> {

diff --git a/ThinkerBell/presentation/src/main/res/layout/fragment_my_page.xml b/ThinkerBell/presentation/src/main/res/layout/fragment_my_page.xml
@@ -85,7 +85,8 @@
         android:layout_height="1dp"
         android:layout_marginTop="22dp"
         android:background="@color/red_gray_700"
-        app:layout_constraintTop_toBottomOf="@id/tv_favorite_schedules" />
+        app:layout_constraintTop_toBottomOf="@id/tv_favorite_schedules"
+        android:visibility="gone"/>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_my_page_favorite_schedule"
@@ -127,7 +128,8 @@
         android:layout_height="1dp"
         android:layout_marginTop="22dp"
         android:background="@color/red_gray_700"
-        app:layout_constraintTop_toBottomOf="@id/tv_favorite_notices" />
+        app:layout_constraintTop_toBottomOf="@id/tv_favorite_notices"
+        android:visibility="gone"/>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_my_page_favorite_notice"