Skip to content

Commit

Permalink
[del] #192 로딩 다이얼로그 삭제
Browse files Browse the repository at this point in the history
- 리프레시 레이아웃이랑 로딩 다이얼로그가 겹치면서 보기에 안 좋아짐.
- 윈도우 전체를 로딩 다이얼로그가 차지하기 때문에 조금만 로딩 시간이 걸려도 화면이 계속 깜박거리는 게 불편함.
  • Loading branch information
leeeha committed Sep 13, 2023
1 parent 640d845 commit 08b1e23
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 50 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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"
Expand Down

This file was deleted.

19 changes: 0 additions & 19 deletions app/src/main/res/layout/fragment_winey_feed_loading_dialog.xml

This file was deleted.

2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -230,5 +230,5 @@
<string name="upload_loading_title_other_line3">절약했어요</string>

<!-- error -->
<string name="error_winey_feed_loading">Can\'t loading winey feed list</string>
<string name="error_winey_feed_loading">Can\'t loading winey feed list</string>
</resources>

0 comments on commit 08b1e23

Please sign in to comment.