diff --git a/app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedFragment.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedFragment.kt index 5fe32f4d..a2e1ee80 100644 --- a/app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedFragment.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedFragment.kt @@ -60,7 +60,6 @@ class WineyFeedFragment : private lateinit var wineyFeedAdapter: WineyFeedAdapter private lateinit var wineyFeedHeaderAdapter: WineyFeedHeaderAdapter private lateinit var wineyFeedLoadAdapter: WineyFeedLoadAdapter - private val loadingDialog by lazy { WineyFeedLoadingDialogFragment() } private var clickedFeedId = -1 private var deleteFeedId = -1 @@ -276,32 +275,21 @@ class WineyFeedFragment : when (loadStates.refresh) { is LoadState.Loading -> { Timber.d("LOADING") - showLoadingDialog() + binding.rvWineyfeedPost.isVisible = false } is LoadState.NotLoading -> { Timber.d("NOT LOADING") - dismissLoadingDialog() binding.rvWineyfeedPost.isVisible = wineyFeedAdapter.itemCount > 0 } is LoadState.Error -> { - dismissLoadingDialog() snackBar(binding.root) { stringOf(R.string.error_winey_feed_loading) } } } } } - private fun showLoadingDialog() { - binding.rvWineyfeedPost.isVisible = false - loadingDialog.show(parentFragmentManager, TAG_LOADING_DIALOG) - } - - private fun dismissLoadingDialog() { - if (loadingDialog.isAdded) loadingDialog.dismiss() - } - private fun initPostLikeStateObserver() { viewModel.postWineyFeedLikeState.flowWithLifecycle(viewLifeCycle).onEach { state -> when (state) { @@ -471,7 +459,6 @@ class WineyFeedFragment : private const val TAG_GOAL_DIALOG = "NO_GOAL_DIALOG" private const val TAG_FEED_DELETE_DIALOG = "FEED_DELETE_DIALOG" private const val TAG_FEED_REPORT_DIALOG = "FEED_REPORT_DIALOG" - private const val TAG_LOADING_DIALOG = "WINEY_FEED_LOADING_DIALOG" private const val POPUP_MENU_POS_OFFSET = 65 private const val KEY_FEED_ID = "feedId" private const val KEY_FEED_WRITER_ID = "feedWriterId" diff --git a/app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedLoadingDialogFragment.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedLoadingDialogFragment.kt deleted file mode 100644 index 91220fda..00000000 --- a/app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedLoadingDialogFragment.kt +++ /dev/null @@ -1,16 +0,0 @@ -package org.go.sopt.winey.presentation.main.feed - -import android.os.Bundle -import org.go.sopt.winey.R -import org.go.sopt.winey.databinding.FragmentWineyFeedLoadingDialogBinding -import org.go.sopt.winey.util.binding.BindingDialogFragment - -class WineyFeedLoadingDialogFragment : - BindingDialogFragment( - R.layout.fragment_winey_feed_loading_dialog - ) { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - dialog?.setCanceledOnTouchOutside(false) - } -} diff --git a/app/src/main/res/layout/fragment_winey_feed_loading_dialog.xml b/app/src/main/res/layout/fragment_winey_feed_loading_dialog.xml deleted file mode 100644 index eb1c0930..00000000 --- a/app/src/main/res/layout/fragment_winey_feed_loading_dialog.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2b190fa1..fb1598ef 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -230,5 +230,5 @@ 절약했어요 - Can\'t loading winey feed list… + Can\'t loading winey feed list