mirror of
https://github.com/recloudstream/cloudstream.git
synced 2024-08-15 01:53:11 +00:00
Reworked visibility
This commit is contained in:
parent
b51aae6bc8
commit
9ce57d9963
1 changed files with 6 additions and 12 deletions
|
@ -247,7 +247,6 @@ class ResultFragmentTv : Fragment() {
|
||||||
)
|
)
|
||||||
// ===== ===== =====
|
// ===== ===== =====
|
||||||
var comingSoon = false
|
var comingSoon = false
|
||||||
var resumeMode = false
|
|
||||||
|
|
||||||
binding?.apply {
|
binding?.apply {
|
||||||
//episodesShadow.rotationX = 180.0f//if(episodesShadow.isRtl()) 180.0f else 0.0f
|
//episodesShadow.rotationX = 180.0f//if(episodesShadow.isRtl()) 180.0f else 0.0f
|
||||||
|
@ -456,10 +455,11 @@ class ResultFragmentTv : Fragment() {
|
||||||
binding?.apply {
|
binding?.apply {
|
||||||
|
|
||||||
if (resume == null) {
|
if (resume == null) {
|
||||||
resumeMode = false
|
|
||||||
return@observeNullable
|
return@observeNullable
|
||||||
}
|
}
|
||||||
resumeMode = true
|
resultResumeSeries.isVisible = true
|
||||||
|
resultPlayMovie.isVisible = false
|
||||||
|
resultPlaySeries.isVisible = false
|
||||||
|
|
||||||
// show progress no matter if series or movie
|
// show progress no matter if series or movie
|
||||||
resume.progress?.let { progress ->
|
resume.progress?.let { progress ->
|
||||||
|
@ -469,14 +469,8 @@ class ResultFragmentTv : Fragment() {
|
||||||
this.max = progress.maxProgress
|
this.max = progress.maxProgress
|
||||||
this.progress = progress.progress
|
this.progress = progress.progress
|
||||||
}
|
}
|
||||||
|
|
||||||
resultResumeProgressHolder.isVisible = true
|
resultResumeProgressHolder.isVisible = true
|
||||||
resultResumeSeries.isVisible = true
|
|
||||||
resultPlayMovie.isVisible = false
|
|
||||||
resultPlaySeries.isVisible = false
|
|
||||||
} ?: run {
|
} ?: run {
|
||||||
//resumeMode = false
|
|
||||||
resultResumeProgressHolder.isVisible = false
|
|
||||||
resultResumeProgressHolder.isVisible = false
|
resultResumeProgressHolder.isVisible = false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -646,7 +640,7 @@ class ResultFragmentTv : Fragment() {
|
||||||
}
|
}
|
||||||
|
|
||||||
observeNullable(viewModel.movie) { data ->
|
observeNullable(viewModel.movie) { data ->
|
||||||
if (data == null || resumeMode) {
|
if (data == null ) {
|
||||||
return@observeNullable
|
return@observeNullable
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -666,7 +660,7 @@ class ResultFragmentTv : Fragment() {
|
||||||
return@setOnLongClickListener true
|
return@setOnLongClickListener true
|
||||||
}
|
}
|
||||||
|
|
||||||
resultPlayMovie.isVisible = !comingSoon
|
resultPlayMovie.isVisible = !comingSoon && resultResumeSeries.isGone
|
||||||
if (comingSoon)
|
if (comingSoon)
|
||||||
resultBookmarkButton.requestFocus()
|
resultBookmarkButton.requestFocus()
|
||||||
else
|
else
|
||||||
|
@ -805,7 +799,7 @@ class ResultFragmentTv : Fragment() {
|
||||||
}
|
}
|
||||||
if (!hasLoadedEpisodesOnce) {
|
if (!hasLoadedEpisodesOnce) {
|
||||||
hasLoadedEpisodesOnce = true
|
hasLoadedEpisodesOnce = true
|
||||||
resultPlaySeries.isVisible = !resumeMode && !comingSoon
|
resultPlaySeries.isVisible = resultResumeSeries.isGone && !comingSoon
|
||||||
resultEpisodesShow.isVisible = true && !comingSoon
|
resultEpisodesShow.isVisible = true && !comingSoon
|
||||||
resultPlaySeriesButton.requestFocus()
|
resultPlaySeriesButton.requestFocus()
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue