Skip to content

circular resume touch fixes #2022

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

circular resume touch fixes #2022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c652bb8
circular resume touch fixes
rockhero1234 Oct 18, 2025
cf9c9d2
better fix
rockhero1234 Oct 19, 2025
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
116 changes: 61 additions & 55 deletions app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,60 +591,6 @@ open class ResultFragmentPhone : FullScreenPlayer() {
}
}*/

observeNullable(viewModel.resumeWatching) { resume ->
resultBinding?.apply {
if (resume == null) {
resultResumeParent.isVisible = false
resultResumeProgressHolder.isVisible = false
return@observeNullable
}
resultResumeParent.isVisible = true
resume.progress?.let { progress ->
resultNextSeriesButton.isVisible = false
resultResumeSeriesTitle.apply {
isVisible = !resume.isMovie
text =
if (resume.isMovie) null else context?.getNameFull(
resume.result.name,
resume.result.episode,
resume.result.season
)
}
if (resume.isMovie){
resultPlayMovie.isGone = true
resultResumeSeriesProgressText.isVisible = true
resultResumeSeriesProgressText.setText(progress.progressLeft)
}
resultResumeSeriesProgress.apply {
isVisible = true
this.max = progress.maxProgress
this.progress = progress.progress
}
resultResumeProgressHolder.isVisible = true
} ?: run {
resultResumeProgressHolder.isVisible = false
if(!resume.isMovie){
resultNextSeriesButton.isVisible = true
resultNextSeriesButton.text =context?.getNameFull(
resume.result.name,
resume.result.episode,
resume.result.season
)
}
resultResumeSeriesProgress.isVisible = false
resultResumeSeriesTitle.isVisible = false
resultResumeSeriesProgressText.isVisible = false
}

resultResumeSeriesButton.setOnClickListener {
resumeAction(storedData, resume)
}
resultNextSeriesButton.setOnClickListener {
resumeAction(storedData, resume)
}
}
}

observeNullable(viewModel.subscribeStatus) { isSubscribed ->
binding?.resultSubscribe?.isVisible = isSubscribed != null
if (isSubscribed == null) return@observeNullable
Expand Down Expand Up @@ -693,7 +639,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
data is Resource.Success && viewModel.currentRepo?.api?.hasDownloadSupport == true

(data as? Resource.Success)?.value?.let { (text, ep) ->
resultPlayMovie.setText(text)
// resultPlayMovie.setText(text)
resultPlayMovie.setOnClickListener {
viewModel.handleAction(
EpisodeClickEvent(ACTION_CLICK_DEFAULT, ep)
Expand All @@ -705,6 +651,12 @@ open class ResultFragmentPhone : FullScreenPlayer() {
)
return@setOnLongClickListener true
}
resultResumeSeriesButton.setOnLongClickListener {
viewModel.handleAction(
EpisodeClickEvent(ACTION_SHOW_OPTIONS, ep)
)
return@setOnLongClickListener true
}
downloadButton.setDefaultClickListener(
VideoDownloadHelper.DownloadEpisodeCached(
name = ep.name,
Expand Down Expand Up @@ -744,6 +696,60 @@ open class ResultFragmentPhone : FullScreenPlayer() {
}
}

observeNullable(viewModel.resumeWatching) { resume ->
resultBinding?.apply {
if (resume == null) {
resultResumeParent.isVisible = false
resultResumeProgressHolder.isVisible = false
return@observeNullable
}
resultResumeParent.isVisible = true
resume.progress?.let { progress ->
resultNextSeriesButton.isVisible = false
resultResumeSeriesTitle.apply {
isVisible = !resume.isMovie
text =
if (resume.isMovie) null else context?.getNameFull(
resume.result.name,
resume.result.episode,
resume.result.season
)
}
if (resume.isMovie){
resultPlayMovie.isGone = true
resultResumeSeriesProgressText.isVisible = true
resultResumeSeriesProgressText.setText(progress.progressLeft)
}
resultResumeSeriesProgress.apply {
isVisible = true
this.max = progress.maxProgress
this.progress = progress.progress
}
resultResumeProgressHolder.isVisible = true
} ?: run {
resultResumeProgressHolder.isVisible = false
if(!resume.isMovie){
resultNextSeriesButton.isVisible = true
resultNextSeriesButton.text =context?.getNameFull(
resume.result.name,
resume.result.episode,
resume.result.season
)
}
resultResumeSeriesProgress.isVisible = false
resultResumeSeriesTitle.isVisible = false
resultResumeSeriesProgressText.isVisible = false
}

resultResumeSeriesButton.setOnClickListener {
resumeAction(storedData, resume)
}
resultNextSeriesButton.setOnClickListener {
resumeAction(storedData, resume)
}
}
}

observe(viewModel.page) { data ->
if (data == null) return@observe
resultBinding?.apply {
Expand Down
7 changes: 6 additions & 1 deletion app/src/main/res/layout/fragment_result.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,6 +618,8 @@
android:textAllCaps="false"
android:maxLines="1"
android:ellipsize="end"
android:clickable="false"
android:focusable="false"
/>
<TextView
android:id="@+id/result_resume_series_progress_text"
Expand All @@ -634,7 +636,9 @@
android:visibility="gone"
tools:visibility="visible"
android:maxLines="1"
android:textAllCaps="false"/>
android:textAllCaps="false"
android:clickable="false"
android:focusable="false"/>
</LinearLayout>
</FrameLayout>
<LinearLayout
Expand Down Expand Up @@ -681,6 +685,7 @@
android:nextFocusDown="@id/result_download_movie"
android:text="@string/play_movie_button"
android:visibility="visible"
tools:visibility="visible"
app:icon="@drawable/ic_baseline_play_arrow_24">

<requestFocus />
Expand Down