devfeijoa · Oct 10, 2026 · Jun 22, 2026 · Jun 22, 2026 · Jun 22, 2026 · Jun 22, 2026
diff --git a/app/src/main/java/com/into/websoso/ui/feedDetail/FeedDetailActivity.kt b/app/src/main/java/com/into/websoso/ui/feedDetail/FeedDetailActivity.kt
@@ -1,6 +1,5 @@
 package com.into.websoso.ui.feedDetail
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
@@ -10,16 +9,16 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.WindowManager.LayoutParams.WRAP_CONTENT
 import android.widget.PopupWindow
-import android.widget.TextView
 import androidx.activity.addCallback
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
 import androidx.activity.viewModels
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.databinding.ViewDataBinding
-import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import coil.load
 import coil.transform.RoundedCornersTransformation
-import com.into.websoso.R.id.tv_feed_thumb_up_count
 import com.into.websoso.R.layout.activity_feed_detail
 import com.into.websoso.core.common.ui.base.BaseActivity
 import com.into.websoso.core.common.ui.model.ResultFrom.BlockUser
@@ -30,12 +29,12 @@ import com.into.websoso.core.common.ui.model.ResultFrom.FeedDetailRefreshed
 import com.into.websoso.core.common.ui.model.ResultFrom.NovelDetailBack
 import com.into.websoso.core.common.ui.model.ResultFrom.OtherUserProfileBack
 import com.into.websoso.core.common.ui.model.ResultFrom.WithdrawUser
-import com.into.websoso.core.common.util.SingleEventHandler
 import com.into.websoso.core.common.util.getS3ImageUrl
 import com.into.websoso.core.common.util.hideKeyboard
 import com.into.websoso.core.common.util.showWebsosoSnackBar
 import com.into.websoso.core.common.util.toFloatPxFromDp
 import com.into.websoso.core.common.util.tracker.Tracker
+import com.into.websoso.core.designsystem.theme.WebsosoTheme
 import com.into.websoso.core.resource.R.drawable.ic_blocked_user_snack_bar
 import com.into.websoso.core.resource.R.drawable.ic_novel_detail_check
 import com.into.websoso.core.resource.R.string.block_user_success_message
@@ -44,10 +43,12 @@ import com.into.websoso.core.resource.R.string.feed_popup_menu_content_report_is
 import com.into.websoso.core.resource.R.string.feed_removed_feed_snackbar
 import com.into.websoso.core.resource.R.string.feed_server_error
 import com.into.websoso.core.resource.R.string.other_user_page_withdraw_user
+import com.into.websoso.data.feed.repository.model.LikeSyncStatus
 import com.into.websoso.databinding.ActivityFeedDetailBinding
 import com.into.websoso.databinding.DialogRemovePopupMenuBinding
 import com.into.websoso.databinding.DialogReportPopupMenuBinding
 import com.into.websoso.databinding.MenuFeedPopupBinding
+import com.into.websoso.feature.feed.component.FeedLikeSyncNotice
 import com.into.websoso.ui.createFeed.CreateFeedActivity
 import com.into.websoso.ui.expandedFeedImage.ExpandedFeedImageActivity
 import com.into.websoso.ui.feedDetail.FeedDetailActivity.MenuType.COMMENT
@@ -88,7 +89,6 @@ class FeedDetailActivity : BaseActivity<ActivityFeedDetailBinding>(activity_feed
             onCommentClick(),
         )
     }
-    private val singleEventHandler: SingleEventHandler by lazy { SingleEventHandler.from() }
     private lateinit var activityResultCallback: ActivityResultLauncher<Intent>
     private val popupBinding: MenuFeedPopupBinding by lazy {
         MenuFeedPopupBinding.inflate(LayoutInflater.from(this))
@@ -99,30 +99,12 @@ class FeedDetailActivity : BaseActivity<ActivityFeedDetailBinding>(activity_feed
 
     private fun onFeedContentClick(): FeedDetailClickListener =
         object : FeedDetailClickListener {
-            @SuppressLint("CutPasteId")
             override fun onLikeButtonClick(
                 view: View,
                 feedId: Long,
             ) {
-                val likeCount: Int =
-                    view
-                        .findViewById<TextView>(tv_feed_thumb_up_count)
-                        .text
-                        .toString()
-                        .toInt()
-                val updatedLikeCount: Int = when (view.isSelected) {
-                    true -> if (likeCount > 0) likeCount - 1 else 0
-                    false -> likeCount + 1
-                }
-
-                view.findViewById<TextView>(tv_feed_thumb_up_count).text =
-                    updatedLikeCount.toString()
-                view.isSelected = !view.isSelected
-
-                singleEventHandler.debounce(timeMillis = 100L, coroutineScope = lifecycleScope) {
-                    tracker.trackEvent("feed_detail_like")
-                    feedDetailViewModel.updateLike()
-                }
+                tracker.trackEvent("feed_detail_like")
+                feedDetailViewModel.updateLike()
             }
 
             override fun onNovelInfoClick(novelId: Long) {
@@ -357,6 +339,21 @@ class FeedDetailActivity : BaseActivity<ActivityFeedDetailBinding>(activity_feed
         super.onCreate(savedInstanceState)
 
         setupView()
+        binding.cvFeedLikeSync.apply {
+            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
+            setContent {
+                val states by feedDetailViewModel.likeSyncStates.collectAsStateWithLifecycle()
+                val isRestoreFailed by feedDetailViewModel.isLikeRestoreFailed.collectAsStateWithLifecycle()
+                WebsosoTheme {
+                    FeedLikeSyncNotice(
+                        isRestoreFailed = isRestoreFailed,
+                        needsRetry = states[feedId] == LikeSyncStatus.NEEDS_RETRY,
+                        isSyncing = states[feedId] == LikeSyncStatus.SYNCING,
+                        onRetry = feedDetailViewModel::retryLike,
+                    )
+                }
+            }
+        }
         setupObserver()
         onFeedDetailClick()
         refreshView()
@@ -371,7 +368,7 @@ class FeedDetailActivity : BaseActivity<ActivityFeedDetailBinding>(activity_feed
                     NovelDetailBack.RESULT_OK,
                     CreateFeed.RESULT_OK,
                     OtherUserProfileBack.RESULT_OK,
-                        -> {
+                    -> {
                         feedDetailViewModel.updateFeedDetail(feedId, CreateFeed)
                     }
 

diff --git a/app/src/main/java/com/into/websoso/ui/feedDetail/UpdatedFeedDetailViewModel.kt b/app/src/main/java/com/into/websoso/ui/feedDetail/UpdatedFeedDetailViewModel.kt
@@ -38,6 +38,12 @@ class UpdatedFeedDetailViewModel
         private val _feedDetailUiState: MutableLiveData<FeedDetailUiState> =
             MutableLiveData(FeedDetailUiState())
         val feedDetailUiState: LiveData<FeedDetailUiState> get() = _feedDetailUiState
+        val likeSyncStates = feedRepository.likeSyncStates
+        val isLikeRestoreFailed = feedRepository.isLikeRestoreFailed
+
+        fun retryLike() {
+            if (feedId != -1L) feedRepository.retryPendingLikes(setOf(feedId))
+        }
 
         fun updateCommentId(newCommentId: Long) {
             this.commentId = newCommentId
@@ -75,19 +81,25 @@ class UpdatedFeedDetailViewModel
                     feedRepository.sosoAllFeeds,
                     feedRepository.sosoRecommendedFeeds,
                     feedRepository.myFeeds,
-                ) { sosoAllFeeds, sosoRecommendedFeeds, myFeeds ->
-                    sosoAllFeeds.find { it.id == targetFeedId }
+                    feedRepository.feedDetailLikeStates,
+                ) { sosoAllFeeds, sosoRecommendedFeeds, myFeeds, detailLikes ->
+                    val feed = sosoAllFeeds.find { it.id == targetFeedId }
                         ?: sosoRecommendedFeeds.find { it.id == targetFeedId }
                         ?: myFeeds.find { it.id == targetFeedId }
+                    feed to detailLikes[targetFeedId]
                 }.distinctUntilChanged()
-                    .collect { feedEntity ->
-                        if (feedEntity != null) {
-                            val currentUiState = _feedDetailUiState.value ?: FeedDetailUiState()
+                    .collect { (feedEntity, likeState) ->
+                        val currentUiState = _feedDetailUiState.value ?: FeedDetailUiState()
+                        val feed = feedEntity?.toFeedModel() ?: currentUiState.feedDetail.feed
+                        if (feed != null) {
                             _feedDetailUiState.value = currentUiState.copy(
                                 loading = false,
                                 isRefreshed = true,
                                 feedDetail = currentUiState.feedDetail.copy(
-                                    feed = feedEntity.toFeedModel(),
+                                    feed = feed.copy(
+                                        isLiked = likeState?.isLiked ?: feed.isLiked,
+                                        likeCount = likeState?.likeCount ?: feed.likeCount,
+                                    ),
                                     novel = currentUiState.feedDetail.novel,
                                 ),
                             )
@@ -145,7 +157,7 @@ class UpdatedFeedDetailViewModel
          */
         override fun onCleared() {
             super.onCleared()
-            feedRepository.syncDirtyFeeds()
+            feedRepository.syncPendingLikes()
         }
 
         /**

diff --git a/app/src/main/java/com/into/websoso/ui/main/feed/FeedFragment.kt b/app/src/main/java/com/into/websoso/ui/main/feed/FeedFragment.kt
@@ -11,8 +11,12 @@ import androidx.fragment.app.viewModels
 import com.into.websoso.R
 import com.into.websoso.R.layout.fragment_feed
 import com.into.websoso.core.common.ui.base.BaseFragment
+import com.into.websoso.core.common.util.collectWithLifecycle
+import com.into.websoso.core.common.util.showWebsosoToast
 import com.into.websoso.core.common.util.tracker.Tracker
 import com.into.websoso.core.designsystem.theme.WebsosoTheme
+import com.into.websoso.core.resource.R.drawable.ic_novel_rating_alert
+import com.into.websoso.core.resource.R.string.feed_like_unrestored_message
 import com.into.websoso.databinding.DialogRemovePopupMenuBinding
 import com.into.websoso.databinding.DialogReportPopupMenuBinding
 import com.into.websoso.databinding.FragmentFeedBinding
@@ -189,6 +193,16 @@ class FeedFragment : BaseFragment<FragmentFeedBinding>(fragment_feed) {
         super.onViewCreated(view, savedInstanceState)
 
         tracker.trackEvent("feed_all")
+        collectUnrestoredLikes()
+    }
+
+    private fun collectUnrestoredLikes() {
+        feedViewModel.hasUnrestoredLikes.collectWithLifecycle(viewLifecycleOwner) { hasUnrestoredLikes ->
+            if (hasUnrestoredLikes) {
+                showWebsosoToast(requireContext(), getString(feed_like_unrestored_message), ic_novel_rating_alert)
+                feedViewModel.acknowledgeUnrestoredLikes()
+            }
+        }
     }
 
     companion object {

diff --git a/app/src/main/res/layout/activity_feed_detail.xml b/app/src/main/res/layout/activity_feed_detail.xml
@@ -56,6 +56,14 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
+        <androidx.compose.ui.platform.ComposeView
+            android:id="@+id/cv_feed_like_sync"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/cl_feed_detail_toolbar" />
+
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv_feed_detail"
             android:layout_width="match_parent"
@@ -64,7 +72,7 @@
             android:overScrollMode="never"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             app:layout_constraintBottom_toTopOf="@+id/cl_feed_detail_input"
-            app:layout_constraintTop_toBottomOf="@+id/cl_feed_detail_toolbar" />
+            app:layout_constraintTop_toBottomOf="@id/cv_feed_like_sync" />
 
         <com.into.websoso.core.common.ui.custom.WebsosoLoadingLayout
             android:id="@+id/wll_feed"

diff --git a/core/datastore/build.gradle.kts b/core/datastore/build.gradle.kts
@@ -12,9 +12,11 @@ android {
 dependencies {
     implementation(projects.core.common)
     implementation(projects.data.account)
+    implementation(projects.data.feed)
     implementation(projects.data.library)
     implementation(projects.data.user)
-
     implementation(libs.datastore.preferences)
     implementation(libs.serialization.json)
+
+    testImplementation(libs.junit)
 }