Skip to content

Loading screen improvement #4938

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
okan35 wants to merge 7 commits into from
Closed

Loading screen improvement #4938

Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4bcf224
Merge pull request #1 from TeamNewPipe/dev
okan35 Nov 20, 2020
1db2cf1
removed loading screen from main screen
okan35 Nov 20, 2020
fa0c4ce
loading added to click to refresh
okan35 Nov 21, 2020
a8efe1d
review changes
okan35 Dec 13, 2020
acdaf30
added progress for video fetch
okan35 Dec 19, 2020
eb5aaae
Merge branch 'newBranchVideoFetch' into whatsNewLoadingScreenChange
okan35 Dec 19, 2020
a9b55cf
use getString
okan35 Dec 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,40 +174,42 @@ class FeedFragment : BaseListFragment<FeedState, Unit>() {
// /////////////////////////////////////////////////////////////////////////

override fun showLoading() {
animateView(refresh_root_view, false, 0)
animateView(items_list, false, 0)
animateView(refresh_root_view, true, 0)
animateView(items_list, true, 0)
Copy link
Copy Markdown
Member

@Stypox Stypox Dec 12, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no need for this, i.e. to show items_list, if you never hide it ;-)

swipeRefreshLayout.isRefreshing=true

animateView(loading_progress_bar, true, 200)
animateView(loading_progress_text, true, 200)
/*animateView(loading_progress_bar, true, 200)
animateView(loading_progress_text, true, 200)*/

empty_state_view?.let { animateView(it, false, 0) }
//empty_state_view?.let { animateView(it, false, 0) }
animateView(error_panel, false, 0)
}

override fun hideLoading() {
animateView(refresh_root_view, true, 200)
animateView(items_list, true, 300)
/*animateView(loading_progress_bar, false, 0)
animateView(loading_progress_text, false, 0)*/

animateView(loading_progress_bar, false, 0)
animateView(loading_progress_text, false, 0)

empty_state_view?.let { animateView(it, false, 0) }
//empty_state_view?.let { animateView(it, false, 0) }
animateView(error_panel, false, 0)
swipeRefreshLayout.isRefreshing = false
}

override fun showEmptyState() {
animateView(refresh_root_view, true, 200)
animateView(items_list, false, 0)
/*animateView(refresh_root_view, true, 200)
animateView(items_list, false, 0)*/

animateView(loading_progress_bar, false, 0)
animateView(loading_progress_text, false, 0)
//animateView(loading_progress_bar, false, 0)
//animateView(loading_progress_text, false, 0)

empty_state_view?.let { animateView(it, true, 800) }
animateView(error_panel, false, 0)
swipeRefreshLayout.isRefreshing = false
}

override fun showError(message: String, showRetryButton: Boolean) {
swipeRefreshLayout.isRefreshing = false
infoListAdapter.clearStreamItemList()
animateView(refresh_root_view, false, 120)
animateView(items_list, false, 120)
Expand Down Expand Up @@ -280,6 +282,7 @@ class FeedFragment : BaseListFragment<FeedState, Unit>() {

private fun handleErrorState(errorState: FeedState.ErrorState): Boolean {
hideLoading()
swipeRefreshLayout.isRefreshing=false
Copy link
Copy Markdown
Member

@Stypox Stypox Dec 12, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need for this, it is already inside hideLoading()

errorState.error?.let {
onError(errorState.error)
return true
Expand Down