Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
529
Issue boards
Milestones
Wiki
Code
Merge requests
15
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC-Android
Commits
d7e8d20c
Commit
d7e8d20c
authored
1 year ago
by
Nicolas Pomepuy
Committed by
Duncan McNamara
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix play queue item when there is no subtitle and "stop after this" is enabled
parent
f48e0d8c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!1788
Multiple fixes on the video player play queue
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
application/vlc-android/res/layout/playlist_item.xml
+5
-1
5 additions, 1 deletion
application/vlc-android/res/layout/playlist_item.xml
application/vlc-android/src/org/videolan/vlc/gui/audio/PlaylistAdapter.kt
+1
-0
1 addition, 0 deletions
...android/src/org/videolan/vlc/gui/audio/PlaylistAdapter.kt
with
6 additions
and
1 deletion
application/vlc-android/res/layout/playlist_item.xml
+
5
−
1
View file @
d7e8d20c
...
...
@@ -31,6 +31,10 @@
name=
"scaleType"
type=
"android.widget.ImageView.ScaleType"
/>
<variable
name=
"stopAfterThis"
type=
"java.lang.Boolean"
/>
<variable
name=
"masked"
type=
"java.lang.Boolean"
/>
...
...
@@ -136,7 +140,7 @@
android:text=
"@{subTitle}"
android:textColor=
"?attr/font_audio_light"
android:textSize=
"12sp"
android:visibility=
"@{TextUtils.isEmpty(subTitle) ? View.GONE : View.VISIBLE}"
android:visibility=
"@{TextUtils.isEmpty(subTitle)
&& !stopAfterThis
? View.GONE : View.VISIBLE}"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toStartOf=
"@+id/stop_after"
app:layout_constraintHorizontal_bias=
"0.5"
...
...
This diff is collapsed.
Click to expand it.
application/vlc-android/src/org/videolan/vlc/gui/audio/PlaylistAdapter.kt
+
1
−
0
View file @
d7e8d20c
...
...
@@ -129,6 +129,7 @@ class PlaylistAdapter(private val player: IPlayer) : DiffUtilAdapter<MediaWrappe
holder
.
binding
.
subTitle
=
MediaUtils
.
getMediaSubtitle
(
media
)
holder
.
binding
.
scaleType
=
ImageView
.
ScaleType
.
CENTER_CROP
holder
.
binding
.
stopAfter
.
visibility
=
if
(
stopAfter
==
position
)
View
.
VISIBLE
else
View
.
GONE
holder
.
binding
.
stopAfterThis
=
(
position
==
stopAfter
)
if
(
currentIndex
==
position
)
{
if
(
model
?.
playing
!=
false
)
holder
.
binding
.
playing
.
start
()
else
holder
.
binding
.
playing
.
stop
()
holder
.
binding
.
playing
.
visibility
=
View
.
VISIBLE
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment