release: 1.1.1 버전 업데이트(to master)

app/src/main/java/com/into/websoso/ui/feedDetail/FeedDetailActivity.kt

@@ -118,7 +118,8 @@ class FeedDetailActivity : BaseActivity<ActivityFeedDetailBinding>(activity_feed
                     false -> likeCount + 1
                 }
 
-                view.findViewById<TextView>(tv_feed_thumb_up_count).text = updatedLikeCount.toString()
+                view.findViewById<TextView>(tv_feed_thumb_up_count).text =
+                    updatedLikeCount.toString()
                 view.isSelected = !view.isSelected
 
                 singleEventHandler.debounce(coroutineScope = lifecycleScope) {
@@ -367,6 +368,7 @@ class FeedDetailActivity : BaseActivity<ActivityFeedDetailBinding>(activity_feed
                         val nickname = result.data?.getStringExtra(USER_NICKNAME).orEmpty()
                         val intent = Intent().apply {
                             putExtra(USER_NICKNAME, nickname)
+                            putExtra(FEED_ID, feedId)
                         }
                         setResult(BlockUser.RESULT_OK, intent)
                         if (!isFinishing) finish()
@@ -462,19 +464,22 @@ class FeedDetailActivity : BaseActivity<ActivityFeedDetailBinding>(activity_feed
                         CreateFeed, FeedDetailRefreshed ->
                             RemovedFeedDialogFragment
                                 .newInstance {
-                                    setResult(CreateFeed.RESULT_OK)
+                                    val extraIntent = Intent().apply { putExtra(FEED_ID, feedId) }
+                                    setResult(FeedDetailRefreshed.RESULT_OK, extraIntent)
                                     if (!isFinishing) finish()
                                 }.show(supportFragmentManager, RemovedFeedDialogFragment.TAG)
 
                         else -> {
-                            setResult(FeedDetailRemoved.RESULT_OK)
+                            val extraIntent = Intent().apply { putExtra(FEED_ID, feedId) }
+                            setResult(FeedDetailRemoved.RESULT_OK, extraIntent)
                             if (!isFinishing) finish()
                         }
                     }
                 }
 
                 feedDetailUiState.isServerError -> {
-                    setResult(FeedDetailError.RESULT_OK)
+                    val extraIntent = Intent().apply { putExtra(FEED_ID, feedId) }
+                    setResult(FeedDetailError.RESULT_OK, extraIntent)
                     if (!isFinishing) finish()
                 }
 
@@ -537,7 +542,7 @@ class FeedDetailActivity : BaseActivity<ActivityFeedDetailBinding>(activity_feed
     }
 
     companion object {
-        private const val FEED_ID: String = "FEED_ID"
+        const val FEED_ID: String = "FEED_ID"
         private const val DEFAULT_FEED_ID: Long = -1
         private const val NOTIFICATION_ID: String = "NOTIFICATION_ID"
         private const val LOTTIE_IMAGE = "lottie_websoso_loading.json"

app/src/main/java/com/into/websoso/ui/main/feed/FeedFragment.kt

@@ -1,15 +1,14 @@
 package com.into.websoso.ui.main.feed
 
 import android.annotation.SuppressLint
-import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
 import android.widget.PopupWindow
 import android.widget.TextView
-import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.ActivityResult
 import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
 import androidx.core.view.children
 import androidx.core.view.isVisible
@@ -32,11 +31,9 @@ import com.into.websoso.core.common.ui.base.BaseFragment
 import com.into.websoso.core.common.ui.custom.WebsosoChip
 import com.into.websoso.core.common.ui.model.ResultFrom.BlockUser
 import com.into.websoso.core.common.ui.model.ResultFrom.CreateFeed
-import com.into.websoso.core.common.ui.model.ResultFrom.FeedDetailBack
 import com.into.websoso.core.common.ui.model.ResultFrom.FeedDetailError
+import com.into.websoso.core.common.ui.model.ResultFrom.FeedDetailRefreshed
 import com.into.websoso.core.common.ui.model.ResultFrom.FeedDetailRemoved
-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.InfiniteScrollListener
 import com.into.websoso.core.common.util.SingleEventHandler
@@ -50,6 +47,7 @@ import com.into.websoso.databinding.FragmentFeedBinding
 import com.into.websoso.databinding.MenuFeedPopupBinding
 import com.into.websoso.ui.createFeed.CreateFeedActivity
 import com.into.websoso.ui.feedDetail.FeedDetailActivity
+import com.into.websoso.ui.feedDetail.FeedDetailActivity.Companion.FEED_ID
 import com.into.websoso.ui.feedDetail.model.EditFeedModel
 import com.into.websoso.ui.main.feed.adapter.FeedAdapter
 import com.into.websoso.ui.main.feed.adapter.FeedType.Feed
@@ -80,7 +78,74 @@ class FeedFragment : BaseFragment<FragmentFeedBinding>(fragment_feed) {
     private val feedViewModel: FeedViewModel by viewModels()
     private val feedAdapter: FeedAdapter by lazy { FeedAdapter(onClickFeedItem()) }
     private val singleEventHandler: SingleEventHandler by lazy { SingleEventHandler.from() }
-    private lateinit var activityResultCallback: ActivityResultLauncher<Intent>
+    private val activityResultCallback by lazy {
+        registerForActivityResult(StartActivityForResult()) { result ->
+            handleActivityResult(result)
+        }
+    }
+
+    private fun handleActivityResult(result: ActivityResult) {
+        when (result.resultCode) {
+            FeedDetailRefreshed.RESULT_OK -> {
+                val removedFeedId = result.data?.getLongExtra(FEED_ID, -1) ?: -1
+                feedViewModel.updateRefreshedFeeds(removedFeedId)
+            }
+
+            CreateFeed.RESULT_OK -> {
+                feedViewModel.updateRefreshedFeeds(true)
+                // TODO: 피드 아예 초기화
+
+                showWebsosoSnackBar(
+                    view = binding.root,
+                    message = getString(feed_create_done),
+                    icon = ic_novel_detail_check,
+                )
+            }
+
+            FeedDetailRemoved.RESULT_OK -> {
+                val removedFeedId = result.data?.getLongExtra(FEED_ID, -1) ?: -1
+                feedViewModel.updateRefreshedFeeds(removedFeedId)
+
+                showWebsosoSnackBar(
+                    view = binding.root,
+                    message = getString(feed_removed_feed_snackbar),
+                    icon = ic_blocked_user_snack_bar,
+                )
+            }
+
+            FeedDetailError.RESULT_OK -> {
+                val removedFeedId = result.data?.getLongExtra(FEED_ID, -1) ?: -1
+                feedViewModel.updateRefreshedFeeds(removedFeedId)
+
+                showWebsosoSnackBar(
+                    view = binding.root,
+                    message = getString(feed_server_error),
+                    icon = ic_blocked_user_snack_bar,
+                )
+            }
+
+            BlockUser.RESULT_OK -> {
+                val nickname = result.data?.getStringExtra(USER_NICKNAME).orEmpty()
+                val removedFeedId = result.data?.getLongExtra(FEED_ID, -1) ?: -1
+
+                feedViewModel.updateRefreshedFeeds(removedFeedId)
+
+                showWebsosoSnackBar(
+                    view = binding.root,
+                    message = getString(block_user_success_message, nickname),
+                    icon = ic_novel_detail_check,
+                )
+            }
+
+            WithdrawUser.RESULT_OK -> {
+                showWebsosoSnackBar(
+                    view = binding.root,
+                    message = getString(R.string.other_user_page_withdraw_user),
+                    icon = ic_blocked_user_snack_bar,
+                )
+            }
+        }
+    }
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -134,7 +199,8 @@ class FeedFragment : BaseFragment<FragmentFeedBinding>(fragment_feed) {
                     false -> likeCount + 1
                 }
 
-                view.findViewById<TextView>(tv_feed_thumb_up_count).text = updatedLikeCount.toString()
+                view.findViewById<TextView>(tv_feed_thumb_up_count).text =
+                    updatedLikeCount.toString()
                 view.isSelected = !view.isSelected
 
                 singleEventHandler.debounce(coroutineScope = lifecycleScope) {
@@ -296,71 +362,8 @@ class FeedFragment : BaseFragment<FragmentFeedBinding>(fragment_feed) {
 
         initView()
         setupObserver()
-        refreshView()
         tracker.trackEvent("feed_all")
-    }
-
-    private fun refreshView() {
-        if (::activityResultCallback.isInitialized.not()) {
-            activityResultCallback = registerForActivityResult(StartActivityForResult()) { result ->
-                when (result.resultCode) {
-                    FeedDetailBack.RESULT_OK,
-                    NovelDetailBack.RESULT_OK,
-                    OtherUserProfileBack.RESULT_OK,
-                    -> feedViewModel.updateRefreshedFeeds(false)
-
-                    CreateFeed.RESULT_OK -> {
-                        feedViewModel.updateRefreshedFeeds(true)
-
-                        showWebsosoSnackBar(
-                            view = binding.root,
-                            message = getString(feed_create_done),
-                            icon = ic_novel_detail_check,
-                        )
-                    }
-
-                    FeedDetailRemoved.RESULT_OK -> {
-                        feedViewModel.updateRefreshedFeeds(false)
-
-                        showWebsosoSnackBar(
-                            view = binding.root,
-                            message = getString(feed_removed_feed_snackbar),
-                            icon = ic_blocked_user_snack_bar,
-                        )
-                    }
-
-                    FeedDetailError.RESULT_OK -> {
-                        feedViewModel.updateRefreshedFeeds(false)
-
-                        showWebsosoSnackBar(
-                            view = binding.root,
-                            message = getString(feed_server_error),
-                            icon = ic_blocked_user_snack_bar,
-                        )
-                    }
-
-                    BlockUser.RESULT_OK -> {
-                        feedViewModel.updateRefreshedFeeds(false)
-
-                        val nickname = result.data?.getStringExtra(USER_NICKNAME).orEmpty()
-
-                        showWebsosoSnackBar(
-                            view = binding.root,
-                            message = getString(block_user_success_message, nickname),
-                            icon = ic_novel_detail_check,
-                        )
-                    }
-
-                    WithdrawUser.RESULT_OK -> {
-                        showWebsosoSnackBar(
-                            view = binding.root,
-                            message = getString(R.string.other_user_page_withdraw_user),
-                            icon = ic_blocked_user_snack_bar,
-                        )
-                    }
-                }
-            }
-        }
+        activityResultCallback
     }
 
     private fun initView() {
@@ -433,7 +436,8 @@ class FeedFragment : BaseFragment<FragmentFeedBinding>(fragment_feed) {
                 val chip = it as Chip
                 chip.isSelected = chip.text == selectedCategory.category.krTitle
             }
-
+            // TODO: 최초로 init할 때 전체상태로 updateFeeds 호출함 -> 리프레시되어야하기 때문에 true 설정
+            // TODO: 뷰모델 init으로 옮기기, isRefreshed 상태 없애기
             feedViewModel.updateFeeds(true)
         }
     }

app/src/main/java/com/into/websoso/ui/main/feed/FeedViewModel.kt

@@ -51,6 +51,10 @@ class FeedViewModel @Inject constructor(
     }
 
     fun updateFeeds(isRefreshed: Boolean = false) {
+        // TODO: 피드 아이템 더 불러오기 함수
+        // TODO: 카테고리 누를 시 init 함수
+        // TODO: 새로고침 함수
+        // TODO: 모두 분리하기
         feedUiState.value?.let { feedUiState ->
             if (!feedUiState.isLoadable) return
 
@@ -63,7 +67,7 @@ class FeedViewModel @Inject constructor(
                     when (feedUiState.feeds.isNotEmpty()) {
                         true -> getFeedsUseCase(
                             selectedCategory.enTitle,
-                            feedUiState.feeds.minOf { it.id }
+                            feedUiState.feeds.minOf { it.id },
                         )
 
                         false -> getFeedsUseCase(selectedCategory.enTitle)
@@ -147,6 +151,14 @@ class FeedViewModel @Inject constructor(
         }
     }
 
+    fun updateRefreshedFeeds(feedId: Long) {
+        feedUiState.value?.let { feedUiState ->
+            _feedUiState.value = feedUiState.copy(
+                feeds = feedUiState.feeds.filterNot { it.id == feedId },
+            )
+        }
+    }
+
     fun updateLike(selectedFeedId: Long, isLiked: Boolean, updatedLikeCount: Int) {
         feedUiState.value?.let { feedUiState ->
             val selectedFeed = feedUiState.feeds.find { feedModel ->
@@ -227,7 +239,7 @@ class FeedViewModel @Inject constructor(
                 }.onSuccess {
                     _feedUiState.value = feedUiState.copy(
                         loading = false,
-                        feeds = feedUiState.feeds.filter { it.id != feedId }
+                        feeds = feedUiState.feeds.filter { it.id != feedId },
                     )
                 }.onFailure {
                     _feedUiState.value = feedUiState.copy(

app/src/main/java/com/into/websoso/ui/main/home/HomeFragment.kt

@@ -323,6 +323,10 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(R.layout.fragment_home) {
     private fun showTermsAgreementDialog() {
         val dialog = TermsAgreementDialogFragment.newInstance()
         dialog.show(parentFragmentManager, TermsAgreementDialogFragment.TERMS_AGREEMENT_TAG)
+
+        dialog.onDismissListener = {
+            homeViewModel.updateTermsAgreementDialogState()
+        }
     }
 
     companion object {

app/src/main/java/com/into/websoso/ui/main/home/HomeViewModel.kt

@@ -2,6 +2,7 @@ package com.into.websoso.ui.main.home
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.into.websoso.data.model.PopularFeedsEntity
@@ -35,6 +36,7 @@ class HomeViewModel
         private val pushMessageRepository: PushMessageRepository,
         private val notificationRepository: NotificationRepository,
         private val userRepository: UserRepository,
+        private val savedStateHandle: SavedStateHandle,
     ) : ViewModel() {
         private val _uiState: MutableLiveData<HomeUiState> = MutableLiveData(HomeUiState())
         val uiState: LiveData<HomeUiState> get() = _uiState
@@ -47,6 +49,12 @@ class HomeViewModel
         private val _showTermsAgreementDialog = MutableStateFlow(false)
         val showTermsAgreementDialog: StateFlow<Boolean> = _showTermsAgreementDialog.asStateFlow()
 
+        private var isTermsAgreementChecked: Boolean
+            get() = savedStateHandle["isTermsAgreementChecked"] ?: false
+            set(value) {
+                savedStateHandle["isTermsAgreementChecked"] = value
+            }
+
         init {
             updateHomeData(true)
             updateNotificationUnread()
@@ -245,13 +253,22 @@ class HomeViewModel
             viewModelScope.launch {
                 runCatching { userRepository.fetchTermsAgreements() }
                     .onSuccess { terms ->
-
                         termsAgreementState.value = terms
-                        _showTermsAgreementDialog.value = !(terms.serviceAgreed && terms.privacyAgreed)
+                        val isShownDialog = !(terms.serviceAgreed && terms.privacyAgreed)
+
+                        _showTermsAgreementDialog.value = isShownDialog
+
+                        if (!isShownDialog) {
+                            isTermsAgreementChecked = true
+                        }
                     }
             }
         }
 
+        fun updateTermsAgreementDialogState() {
+            _showTermsAgreementDialog.value = false
+        }
+
         fun updateFCMToken(token: String) {
             viewModelScope.launch {
                 runCatching {

app/src/main/java/com/into/websoso/ui/main/home/dialog/TermsAgreementDialogFragment.kt

@@ -1,5 +1,6 @@
 package com.into.websoso.ui.main.home.dialog
 
+import android.content.DialogInterface
 import android.os.Bundle
 import android.view.View
 import com.into.websoso.R
@@ -9,6 +10,8 @@ import com.into.websoso.ui.termsAgreement.TermsAgreementDialogBottomSheet
 
 class TermsAgreementDialogFragment :
     BaseDialogFragment<DialogTermsAgreementPopupMenuBinding>(R.layout.dialog_terms_agreement_popup_menu) {
+    var onDismissListener: (() -> Unit)? = null
+
     override fun onViewCreated(
         view: View,
         savedInstanceState: Bundle?,
@@ -42,6 +45,11 @@ class TermsAgreementDialogFragment :
         dismiss()
     }
 
+    override fun onDismiss(dialog: DialogInterface) {
+        super.onDismiss(dialog)
+        onDismissListener?.invoke()
+    }
+
     companion object {
         const val TERMS_AGREEMENT_TAG = "TermsAgreementDialog"
         const val TERMS_AGREEMENT_BOTTOM_SHEET_TAG = "TermsAgreementDialogBottomSheet"