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

Merged
merged 2 commits into from
Oct 25, 2025
Merged

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
4ee75ec
fix
rockhero1234 Oct 25, 2025
a2234cd
Merge branch 'master' into uplift_circular
fire-light42 Oct 25, 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
11 changes: 9 additions & 2 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 @@ -594,6 +594,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
resultBinding?.apply {
if (resume == null) {
resultResumeParent.isVisible = false
resultPlayParent.isVisible = true
resultResumeProgressHolder.isVisible = false
return@observeNullable
}
Expand All @@ -609,8 +610,8 @@ open class ResultFragmentPhone : FullScreenPlayer() {
resume.result.season
)
}
if (resume.isMovie) {
resultPlayMovie.isGone = true
if (resume.isMovie){
resultPlayParent.isGone = true
resultResumeSeriesProgressText.isVisible = true
resultResumeSeriesProgressText.setText(progress.progressLeft)
}
Expand Down Expand Up @@ -704,6 +705,12 @@ open class ResultFragmentPhone : FullScreenPlayer() {
)
return@setOnLongClickListener true
}
resultResumeSeriesButton.setOnLongClickListener {
Copy link
Collaborator

Choose a reason for hiding this comment

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

I am unable to trigger this?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Did you mean to place this somewhere else given that no series will be a valid movie?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah it's only for movie

viewModel.handleAction(
EpisodeClickEvent(ACTION_SHOW_OPTIONS, ep)
)
return@setOnLongClickListener true
}
downloadButton.setDefaultClickListener(
VideoDownloadHelper.DownloadEpisodeCached(
name = ep.name,
Expand Down
18 changes: 11 additions & 7 deletions 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,7 +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"
style="@style/Widget.MaterialComponents.Button.TextButton"
Expand All @@ -634,7 +635,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 @@ -667,16 +670,18 @@
android:layout_height="wrap_content"
android:orientation="vertical"
tools:visibility="visible">

<LinearLayout
android:id="@+id/result_play_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp">
<com.google.android.material.button.MaterialButton
android:id="@+id/result_play_movie"
style="@style/WhiteButton"
android:layout_width="match_parent"

android:layout_gravity="center_vertical"
android:layout_marginStart="0dp"
android:layout_marginEnd="0dp"
android:layout_marginBottom="10dp"
android:nextFocusUp="@id/result_bookmark_Button"
android:nextFocusDown="@id/result_download_movie"
android:text="@string/play_movie_button"
Expand All @@ -686,8 +691,7 @@
<requestFocus />

</com.google.android.material.button.MaterialButton>


</LinearLayout>
<!--<com.google.android.material.button.MaterialButton
android:nextFocusUp="@id/result_play_movie"
android:nextFocusDown="@id/result_season_button"
Expand Down