diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
index 6030b5dc2c..3632adefaa 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
@@ -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
@@ -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)
@@ -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,
@@ -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 {
diff --git a/app/src/main/res/layout/fragment_result.xml b/app/src/main/res/layout/fragment_result.xml
index 5b2eb262ec..8d51fee036 100644
--- a/app/src/main/res/layout/fragment_result.xml
+++ b/app/src/main/res/layout/fragment_result.xml
@@ -618,6 +618,8 @@
android:textAllCaps="false"
android:maxLines="1"
android:ellipsize="end"
+ android:clickable="false"
+ android:focusable="false"
/>
+ android:textAllCaps="false"
+ android:clickable="false"
+ android:focusable="false"/>